tools include uapi: Update linux/fs.h copy
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 733ac4f9935c4b257aff2ec476e6c20665daf6c2 Gitweb: https://git.kernel.org/tip/733ac4f9935c4b257aff2ec476e6c20665daf6c2 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Tue, 30 Oct 2018 12:27:37 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 31 Oct 2018 09:57:51 -0300
tools include uapi: Update linux/fs.h copy
To silence this 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
Due to just two comments added by:
Fixes 578bdaabd015 ("crypto: speck - remove Speck")
So nothing that entails changes in tools/, that so far uses fs.h to generate the mount and umount syscalls 'flags' argument integer->string tables with:
$ tools/perf/trace/beauty/mount_flags.sh
static const char *mount_flags[] = {
[4096 ? (ilog2(4096) + 1) : 0] = "BIND",
<SNIP>
[30 + 1] = "ACTIVE",
[31 + 1] = "NOUSER",
};
$
# trace -e mount,umount mount --bind /proc /mnt
1.228 ( 2.581 ms): mount/1068 mount(dev_name: /mnt, dir_name: 0x55f011c354a0, type: 0x55f011c38170, flags: BIND) = 0
# trace -e mount,umount umount /proc /mnt
umount: /proc: target is busy.
1.587 ( 0.010 ms): umount/1070 umount2(name: /proc) = -1 EBUSY Device or resource busy
1.799 (12.660 ms): umount/1070 umount2(name: /mnt) = 0
#Cc Adrian Hunter <[email protected]>
Cc David Ahern <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Wang Nan <[email protected]>
Cc Jason A. Donenfeld <[email protected]>
Cc Herbert Xu <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/include/uapi/linux/fs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/include/uapi/linux/fs.h +2 -2
@@ -279,8 +279,8 @@ struct fsxattr {#define FS_ENCRYPTION_MODE_AES_256_CTS 4#define FS_ENCRYPTION_MODE_AES_128_CBC 5#define FS_ENCRYPTION_MODE_AES_128_CTS 6 -#define FS_ENCRYPTION_MODE_SPECK128_256_XTS 7 -#define FS_ENCRYPTION_MODE_SPECK128_256_CTS 8 +#define FS_ENCRYPTION_MODE_SPECK128_256_XTS 7/* Removed, do not use. */ +#define FS_ENCRYPTION_MODE_SPECK128_256_CTS 8/* Removed, do not use. */ struct fscrypt_policy {__u8 version;