History

Merge branches 'for-3.16/i2c-hid', 'for-3.16/rmi4', 'for-3.16/sony' and 'for-3.16/thingm' into for-linus

Jiri Kosina committed 12 years ago

Commit beea3f45 parents af5666e f58b848 ba391e5 88f6576 e4aecaf934 files · +11559 −27157Browse files

Showing the changes to include/uapi/linux (3 of 934 files). Show all

Unified · Split

3 files
  1. include/uapi/linux/fuse.h +20 −2
  2. include/uapi/linux/hyperv.h +1 −0
  3. include/uapi/linux/input.h +1 −0
include/uapi/linux/fuse.h+20−2
@@ -96,6 +96,11 @@ · 95 unmodified lines
9696 *
9797 * 7.23
9898 * - add FUSE_WRITEBACK_CACHE
99+ * - add time_gran to fuse_init_out
100+ * - add reserved space to fuse_init_out
101+ * - add FATTR_CTIME
102+ * - add ctime and ctimensec to fuse_setattr_in
103+ * - add FUSE_RENAME2 request
99104 */
100105
101106 #ifndef _LINUX_FUSE_H
@@ -191,6 +196,7 @@ struct fuse_file_lock { · 89 unmodified lines
191196 #define FATTR_ATIME_NOW (1 << 7)
192197 #define FATTR_MTIME_NOW (1 << 8)
193198 #define FATTR_LOCKOWNER (1 << 9)
199+#define FATTR_CTIME (1 << 10)
194200
195201 /**
196202 * Flags returned by the OPEN request
@@ -348,6 +354,7 @@ enum fuse_opcode { · 151 unmodified lines
348354 FUSE_BATCH_FORGET = 42,
349355 FUSE_FALLOCATE = 43,
350356 FUSE_READDIRPLUS = 44,
357+ FUSE_RENAME2 = 45,
351358
352359 /* CUSE specific operations */
353360 CUSE_INIT = 4096,
@@ -426,6 +433,12 @@ struct fuse_rename_in { · 72 unmodified lines
426433 uint64_t newdir;
427434 };
428435
436+struct fuse_rename2_in {
437+ uint64_t newdir;
438+ uint32_t flags;
439+ uint32_t padding;
440+};
441+
429442 struct fuse_link_in {
430443 uint64_t oldnodeid;
431444 };
@@ -438,10 +451,10 @@ struct fuse_setattr_in { · 6 unmodified lines
438451 uint64_t lock_owner;
439452 uint64_t atime;
440453 uint64_t mtime;
441− uint64_t unused2;
454+ uint64_t ctime;
442455 uint32_t atimensec;
443456 uint32_t mtimensec;
444− uint32_t unused3;
457+ uint32_t ctimensec;
445458 uint32_t mode;
446459 uint32_t unused4;
447460 uint32_t uid;
@@ -559,6 +572,9 @@ struct fuse_init_in { · 111 unmodified lines
559572 uint32_t flags;
560573 };
561574
575+#define FUSE_COMPAT_INIT_OUT_SIZE 8
576+#define FUSE_COMPAT_22_INIT_OUT_SIZE 24
577+
562578 struct fuse_init_out {
563579 uint32_t major;
564580 uint32_t minor;
@@ -567,6 +583,8 @@ struct fuse_init_out { · 2 unmodified lines
567583 uint16_t max_background;
568584 uint16_t congestion_threshold;
569585 uint32_t max_write;
586+ uint32_t time_gran;
587+ uint32_t unused[9];
570588 };
571589
572590 #define CUSE_INIT_INFO_MAX 4096
include/uapi/linux/hyperv.h+1−0
@@ -305,6 +305,7 @@ enum hv_kvp_exchg_pool { · 304 unmodified lines
305305 #define HV_ERROR_DEVICE_NOT_CONNECTED 0x8007048F
306306 #define HV_INVALIDARG 0x80070057
307307 #define HV_GUID_NOTFOUND 0x80041002
308+#define HV_ERROR_ALREADY_EXISTS 0x80070050
308309
309310 #define ADDR_FAMILY_NONE 0x00
310311 #define ADDR_FAMILY_IPV4 0x01
include/uapi/linux/input.h+1−0
@@ -164,6 +164,7 @@ struct input_keymap_entry { · 163 unmodified lines
164164 #define INPUT_PROP_DIRECT 0x01 /* direct input devices */
165165 #define INPUT_PROP_BUTTONPAD 0x02 /* has button(s) under pad */
166166 #define INPUT_PROP_SEMI_MT 0x03 /* touch rectangle only */
167+#define INPUT_PROP_TOPBUTTONPAD 0x04 /* softbuttons at top of pad */
167168
168169 #define INPUT_PROP_MAX 0x1f
169170 #define INPUT_PROP_CNT (INPUT_PROP_MAX + 1)