Cross-merge networking fixes after downstream PR. No conflicts or adjacent changes.
Showing the changes to include/uapi (2 of 304 files). Show all
Unified · Split
| @@ -206,6 +206,7 @@ · 205 unmodified lines | |||
| 206 | * - add extension header | 206 | * - add extension header |
| 207 | * - add FUSE_EXT_GROUPS | 207 | * - add FUSE_EXT_GROUPS |
| 208 | * - add FUSE_CREATE_SUPP_GROUP | 208 | * - add FUSE_CREATE_SUPP_GROUP |
| 209 | * - add FUSE_HAS_EXPIRE_ONLY | ||
| 209 | */ | 210 | */ |
| 210 | 211 | ||
| 211 | #ifndef _LINUX_FUSE_H | 212 | #ifndef _LINUX_FUSE_H |
| @@ -369,6 +370,7 @@ struct fuse_file_lock { · 157 unmodified lines | |||
| 369 | * FUSE_HAS_INODE_DAX: use per inode DAX | 370 | * FUSE_HAS_INODE_DAX: use per inode DAX |
| 370 | * FUSE_CREATE_SUPP_GROUP: add supplementary group info to create, mkdir, | 371 | * FUSE_CREATE_SUPP_GROUP: add supplementary group info to create, mkdir, |
| 371 | * symlink and mknod (single group that matches parent) | 372 | * symlink and mknod (single group that matches parent) |
| 373 | * FUSE_HAS_EXPIRE_ONLY: kernel supports expiry-only entry invalidation | ||
| 372 | */ | 374 | */ |
| 373 | #define FUSE_ASYNC_READ (1 << 0) | 375 | #define FUSE_ASYNC_READ (1 << 0) |
| 374 | #define FUSE_POSIX_LOCKS (1 << 1) | 376 | #define FUSE_POSIX_LOCKS (1 << 1) |
| @@ -406,6 +408,7 @@ struct fuse_file_lock { · 31 unmodified lines | |||
| 406 | #define FUSE_SECURITY_CTX (1ULL << 32) | 408 | #define FUSE_SECURITY_CTX (1ULL << 32) |
| 407 | #define FUSE_HAS_INODE_DAX (1ULL << 33) | 409 | #define FUSE_HAS_INODE_DAX (1ULL << 33) |
| 408 | #define FUSE_CREATE_SUPP_GROUP (1ULL << 34) | 410 | #define FUSE_CREATE_SUPP_GROUP (1ULL << 34) |
| 411 | #define FUSE_HAS_EXPIRE_ONLY (1ULL << 35) | ||
| 409 | 412 | ||
| 410 | /** | 413 | /** |
| 411 | * CUSE INIT request/reply flags | 414 | * CUSE INIT request/reply flags |
| @@ -70,6 +70,31 @@ struct utp_upiu_query { · 69 unmodified lines | |||
| 70 | __be32 reserved[2]; | 70 | __be32 reserved[2]; |
| 71 | }; | 71 | }; |
| 72 | 72 | ||
| 73 | /** | ||
| 74 | * struct utp_upiu_query_v4_0 - upiu request buffer structure for | ||
| 75 | * query request >= UFS 4.0 spec. | ||
| 76 | * @opcode: command to perform B-0 | ||
| 77 | * @idn: a value that indicates the particular type of data B-1 | ||
| 78 | * @index: Index to further identify data B-2 | ||
| 79 | * @selector: Index to further identify data B-3 | ||
| 80 | * @osf4: spec field B-5 | ||
| 81 | * @osf5: spec field B 6,7 | ||
| 82 | * @osf6: spec field DW 8,9 | ||
| 83 | * @osf7: spec field DW 10,11 | ||
| 84 | */ | ||
| 85 | struct utp_upiu_query_v4_0 { | ||
| 86 | __u8 opcode; | ||
| 87 | __u8 idn; | ||
| 88 | __u8 index; | ||
| 89 | __u8 selector; | ||
| 90 | __u8 osf3; | ||
| 91 | __u8 osf4; | ||
| 92 | __be16 osf5; | ||
| 93 | __be32 osf6; | ||
| 94 | __be32 osf7; | ||
| 95 | __be32 reserved; | ||
| 96 | }; | ||
| 97 | |||
| 73 | /** | 98 | /** |
| 74 | * struct utp_upiu_cmd - Command UPIU structure | 99 | * struct utp_upiu_cmd - Command UPIU structure |
| 75 | * @data_transfer_len: Data Transfer Length DW-3 | 100 | * @data_transfer_len: Data Transfer Length DW-3 |