beea3f45 parents af5666e f58b848 ba391e5 88f6576 e4aecaf934 files · +11559 −27157Browse filesShowing the changes to include/uapi (5 of 934 files). Show all
Unified · Split
| @@ -133,20 +133,20 @@ · 132 unmodified lines | ||
| 133 | 133 | #endif |
| 134 | 134 | |
| 135 | 135 | /* |
| 136 | − * fd "private" POSIX locks. | |
| 136 | + * Open File Description Locks | |
| 137 | 137 | * |
| 138 | − * Usually POSIX locks held by a process are released on *any* close and are | |
| 138 | + * Usually record locks held by a process are released on *any* close and are | |
| 139 | 139 | * not inherited across a fork(). |
| 140 | 140 | * |
| 141 | − * These cmd values will set locks that conflict with normal POSIX locks, but | |
| 142 | − * are "owned" by the opened file, not the process. This means that they are | |
| 143 | − * inherited across fork() like BSD (flock) locks, and they are only released | |
| 144 | − * automatically when the last reference to the the open file against which | |
| 145 | − * they were acquired is put. | |
| 141 | + * These cmd values will set locks that conflict with process-associated | |
| 142 | + * record locks, but are "owned" by the open file description, not the | |
| 143 | + * process. This means that they are inherited across fork() like BSD (flock) | |
| 144 | + * locks, and they are only released automatically when the last reference to | |
| 145 | + * the the open file against which they were acquired is put. | |
| 146 | 146 | */ |
| 147 | −#define F_GETLKP 36 | |
| 148 | −#define F_SETLKP 37 | |
| 149 | −#define F_SETLKPW 38 | |
| 147 | +#define F_OFD_GETLK 36 | |
| 148 | +#define F_OFD_SETLK 37 | |
| 149 | +#define F_OFD_SETLKW 38 | |
| 150 | 150 | |
| 151 | 151 | #define F_OWNER_TID 0 |
| 152 | 152 | #define F_OWNER_PID 1 |
| @@ -120,7 +120,6 @@ struct drm_tegra_submit { · 119 unmodified lines | ||
| 120 | 120 | __u32 num_waitchks; |
| 121 | 121 | __u32 waitchk_mask; |
| 122 | 122 | __u32 timeout; |
| 123 | − __u32 pad; | |
| 124 | 123 | __u64 syncpts; |
| 125 | 124 | __u64 cmdbufs; |
| 126 | 125 | __u64 relocs; |
| @@ -96,6 +96,11 @@ · 95 unmodified lines | ||
| 96 | 96 | * |
| 97 | 97 | * 7.23 |
| 98 | 98 | * - 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 | |
| 99 | 104 | */ |
| 100 | 105 | |
| 101 | 106 | #ifndef _LINUX_FUSE_H |
| @@ -191,6 +196,7 @@ struct fuse_file_lock { · 89 unmodified lines | ||
| 191 | 196 | #define FATTR_ATIME_NOW (1 << 7) |
| 192 | 197 | #define FATTR_MTIME_NOW (1 << 8) |
| 193 | 198 | #define FATTR_LOCKOWNER (1 << 9) |
| 199 | +#define FATTR_CTIME (1 << 10) | |
| 194 | 200 | |
| 195 | 201 | /** |
| 196 | 202 | * Flags returned by the OPEN request |
| @@ -348,6 +354,7 @@ enum fuse_opcode { · 151 unmodified lines | ||
| 348 | 354 | FUSE_BATCH_FORGET = 42, |
| 349 | 355 | FUSE_FALLOCATE = 43, |
| 350 | 356 | FUSE_READDIRPLUS = 44, |
| 357 | + FUSE_RENAME2 = 45, | |
| 351 | 358 | |
| 352 | 359 | /* CUSE specific operations */ |
| 353 | 360 | CUSE_INIT = 4096, |
| @@ -426,6 +433,12 @@ struct fuse_rename_in { · 72 unmodified lines | ||
| 426 | 433 | uint64_t newdir; |
| 427 | 434 | }; |
| 428 | 435 | |
| 436 | +struct fuse_rename2_in { | |
| 437 | + uint64_t newdir; | |
| 438 | + uint32_t flags; | |
| 439 | + uint32_t padding; | |
| 440 | +}; | |
| 441 | + | |
| 429 | 442 | struct fuse_link_in { |
| 430 | 443 | uint64_t oldnodeid; |
| 431 | 444 | }; |
| @@ -438,10 +451,10 @@ struct fuse_setattr_in { · 6 unmodified lines | ||
| 438 | 451 | uint64_t lock_owner; |
| 439 | 452 | uint64_t atime; |
| 440 | 453 | uint64_t mtime; |
| 441 | − uint64_t unused2; | |
| 454 | + uint64_t ctime; | |
| 442 | 455 | uint32_t atimensec; |
| 443 | 456 | uint32_t mtimensec; |
| 444 | − uint32_t unused3; | |
| 457 | + uint32_t ctimensec; | |
| 445 | 458 | uint32_t mode; |
| 446 | 459 | uint32_t unused4; |
| 447 | 460 | uint32_t uid; |
| @@ -559,6 +572,9 @@ struct fuse_init_in { · 111 unmodified lines | ||
| 559 | 572 | uint32_t flags; |
| 560 | 573 | }; |
| 561 | 574 | |
| 575 | +#define FUSE_COMPAT_INIT_OUT_SIZE 8 | |
| 576 | +#define FUSE_COMPAT_22_INIT_OUT_SIZE 24 | |
| 577 | + | |
| 562 | 578 | struct fuse_init_out { |
| 563 | 579 | uint32_t major; |
| 564 | 580 | uint32_t minor; |
| @@ -567,6 +583,8 @@ struct fuse_init_out { · 2 unmodified lines | ||
| 567 | 583 | uint16_t max_background; |
| 568 | 584 | uint16_t congestion_threshold; |
| 569 | 585 | uint32_t max_write; |
| 586 | + uint32_t time_gran; | |
| 587 | + uint32_t unused[9]; | |
| 570 | 588 | }; |
| 571 | 589 | |
| 572 | 590 | #define CUSE_INIT_INFO_MAX 4096 |
| @@ -305,6 +305,7 @@ enum hv_kvp_exchg_pool { · 304 unmodified lines | ||
| 305 | 305 | #define HV_ERROR_DEVICE_NOT_CONNECTED 0x8007048F |
| 306 | 306 | #define HV_INVALIDARG 0x80070057 |
| 307 | 307 | #define HV_GUID_NOTFOUND 0x80041002 |
| 308 | +#define HV_ERROR_ALREADY_EXISTS 0x80070050 | |
| 308 | 309 | |
| 309 | 310 | #define ADDR_FAMILY_NONE 0x00 |
| 310 | 311 | #define ADDR_FAMILY_IPV4 0x01 |
| @@ -164,6 +164,7 @@ struct input_keymap_entry { · 163 unmodified lines | ||
| 164 | 164 | #define INPUT_PROP_DIRECT 0x01 /* direct input devices */ |
| 165 | 165 | #define INPUT_PROP_BUTTONPAD 0x02 /* has button(s) under pad */ |
| 166 | 166 | #define INPUT_PROP_SEMI_MT 0x03 /* touch rectangle only */ |
| 167 | +#define INPUT_PROP_TOPBUTTONPAD 0x04 /* softbuttons at top of pad */ | |
| 167 | 168 | |
| 168 | 169 | #define INPUT_PROP_MAX 0x1f |
| 169 | 170 | #define INPUT_PROP_CNT (INPUT_PROP_MAX + 1) |