History

Merge branch 'for-6.8/cxl-cdat' into for-6.8/cxl

Pick up the CDAT parsing and QOS class infrastructure for v6.8.

Dan Williams committed 2 years ago

Commit 11c83932 parents 58f1e9d 185c1a4662 files · +7889 −3819Browse files

Showing the changes to include/uapi (1 of 662 files). Show all

Unified · Split

include/uapi/linux/fuse.h+6−4
@@ -209,7 +209,7 @@ · 208 unmodified lines
209209 * - add FUSE_HAS_EXPIRE_ONLY
210210 *
211211 * 7.39
212− * - add FUSE_DIRECT_IO_RELAX
212+ * - add FUSE_DIRECT_IO_ALLOW_MMAP
213213 * - add FUSE_STATX and related structures
214214 */
215215
@@ -409,8 +409,7 @@ struct fuse_file_lock { · 193 unmodified lines
409409 * FUSE_CREATE_SUPP_GROUP: add supplementary group info to create, mkdir,
410410 * symlink and mknod (single group that matches parent)
411411 * FUSE_HAS_EXPIRE_ONLY: kernel supports expiry-only entry invalidation
412− * FUSE_DIRECT_IO_RELAX: relax restrictions in FOPEN_DIRECT_IO mode, for now
413− * allow shared mmap
412+ * FUSE_DIRECT_IO_ALLOW_MMAP: allow shared mmap in FOPEN_DIRECT_IO mode.
414413 */
415414 #define FUSE_ASYNC_READ (1 << 0)
416415 #define FUSE_POSIX_LOCKS (1 << 1)
@@ -449,7 +448,10 @@ struct fuse_file_lock { · 32 unmodified lines
449448 #define FUSE_HAS_INODE_DAX (1ULL << 33)
450449 #define FUSE_CREATE_SUPP_GROUP (1ULL << 34)
451450 #define FUSE_HAS_EXPIRE_ONLY (1ULL << 35)
452−#define FUSE_DIRECT_IO_RELAX (1ULL << 36)
451+#define FUSE_DIRECT_IO_ALLOW_MMAP (1ULL << 36)
452+
453+/* Obsolete alias for FUSE_DIRECT_IO_ALLOW_MMAP */
454+#define FUSE_DIRECT_IO_RELAX FUSE_DIRECT_IO_ALLOW_MMAP
453455
454456 /**
455457 * CUSE INIT request/reply flags

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t