Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tools include uapi: Sync linux/fs.h copy with the kernel sources

To get the changes in:

e262e32d6bde ("vfs: Suppress MS_* flag defs within the kernel unless explicitly enabled")

That made the mount flags string table generator to switch to using
mount.h instead.

This silences the following perf build warning:

Warning: Kernel ABI header at 'tools/include/uapi/linux/fs.h' differs from latest version at 'include/uapi/linux/fs.h'
diff -u tools/include/uapi/linux/fs.h include/uapi/linux/fs.h

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Luis Cláudio Gonçalves <lclaudio@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-mosz81pa6iwxko4p2owbm3ss@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

+8 -52
+8 -52
tools/include/uapi/linux/fs.h
··· 14 14 #include <linux/ioctl.h> 15 15 #include <linux/types.h> 16 16 17 + /* Use of MS_* flags within the kernel is restricted to core mount(2) code. */ 18 + #if !defined(__KERNEL__) 19 + #include <linux/mount.h> 20 + #endif 21 + 17 22 /* 18 23 * It's silly to have NR_OPEN bigger than NR_FILE, but you can change 19 24 * the file limit at runtime and only root can increase the per-process ··· 105 100 106 101 107 102 #define NR_FILE 8192 /* this can well be larger on a larger system */ 108 - 109 - 110 - /* 111 - * These are the fs-independent mount-flags: up to 32 flags are supported 112 - */ 113 - #define MS_RDONLY 1 /* Mount read-only */ 114 - #define MS_NOSUID 2 /* Ignore suid and sgid bits */ 115 - #define MS_NODEV 4 /* Disallow access to device special files */ 116 - #define MS_NOEXEC 8 /* Disallow program execution */ 117 - #define MS_SYNCHRONOUS 16 /* Writes are synced at once */ 118 - #define MS_REMOUNT 32 /* Alter flags of a mounted FS */ 119 - #define MS_MANDLOCK 64 /* Allow mandatory locks on an FS */ 120 - #define MS_DIRSYNC 128 /* Directory modifications are synchronous */ 121 - #define MS_NOATIME 1024 /* Do not update access times. */ 122 - #define MS_NODIRATIME 2048 /* Do not update directory access times */ 123 - #define MS_BIND 4096 124 - #define MS_MOVE 8192 125 - #define MS_REC 16384 126 - #define MS_VERBOSE 32768 /* War is peace. Verbosity is silence. 127 - MS_VERBOSE is deprecated. */ 128 - #define MS_SILENT 32768 129 - #define MS_POSIXACL (1<<16) /* VFS does not apply the umask */ 130 - #define MS_UNBINDABLE (1<<17) /* change to unbindable */ 131 - #define MS_PRIVATE (1<<18) /* change to private */ 132 - #define MS_SLAVE (1<<19) /* change to slave */ 133 - #define MS_SHARED (1<<20) /* change to shared */ 134 - #define MS_RELATIME (1<<21) /* Update atime relative to mtime/ctime. */ 135 - #define MS_KERNMOUNT (1<<22) /* this is a kern_mount call */ 136 - #define MS_I_VERSION (1<<23) /* Update inode I_version field */ 137 - #define MS_STRICTATIME (1<<24) /* Always perform atime updates */ 138 - #define MS_LAZYTIME (1<<25) /* Update the on-disk [acm]times lazily */ 139 - 140 - /* These sb flags are internal to the kernel */ 141 - #define MS_SUBMOUNT (1<<26) 142 - #define MS_NOREMOTELOCK (1<<27) 143 - #define MS_NOSEC (1<<28) 144 - #define MS_BORN (1<<29) 145 - #define MS_ACTIVE (1<<30) 146 - #define MS_NOUSER (1<<31) 147 - 148 - /* 149 - * Superblock flags that can be altered by MS_REMOUNT 150 - */ 151 - #define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_I_VERSION|\ 152 - MS_LAZYTIME) 153 - 154 - /* 155 - * Old magic mount flag and mask 156 - */ 157 - #define MS_MGC_VAL 0xC0ED0000 158 - #define MS_MGC_MSK 0xffff0000 159 103 160 104 /* 161 105 * Structure for FS_IOC_FSGETXATTR[A] and FS_IOC_FSSETXATTR. ··· 223 269 #define FS_POLICY_FLAGS_PAD_16 0x02 224 270 #define FS_POLICY_FLAGS_PAD_32 0x03 225 271 #define FS_POLICY_FLAGS_PAD_MASK 0x03 226 - #define FS_POLICY_FLAGS_VALID 0x03 272 + #define FS_POLICY_FLAG_DIRECT_KEY 0x04 /* use master key directly */ 273 + #define FS_POLICY_FLAGS_VALID 0x07 227 274 228 275 /* Encryption algorithms */ 229 276 #define FS_ENCRYPTION_MODE_INVALID 0 ··· 236 281 #define FS_ENCRYPTION_MODE_AES_128_CTS 6 237 282 #define FS_ENCRYPTION_MODE_SPECK128_256_XTS 7 /* Removed, do not use. */ 238 283 #define FS_ENCRYPTION_MODE_SPECK128_256_CTS 8 /* Removed, do not use. */ 284 + #define FS_ENCRYPTION_MODE_ADIANTUM 9 239 285 240 286 struct fscrypt_policy { 241 287 __u8 version;