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

tools headers UAPI: Sync linux/fscrypt.h with the kernel sources

To pick the changes from:

3ceb6543e9cf6ed8 ("fscrypt: remove kernel-internal constants from UAPI header")

That don't result in any changes in tooling, just addressing this perf
build warning:

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

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Eric Biggers <ebiggers@google.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Arnaldo Carvalho de Melo 4a443a51 7ddcdea5

+2 -3
+2 -3
tools/include/uapi/linux/fscrypt.h
··· 20 20 #define FSCRYPT_POLICY_FLAG_DIRECT_KEY 0x04 21 21 #define FSCRYPT_POLICY_FLAG_IV_INO_LBLK_64 0x08 22 22 #define FSCRYPT_POLICY_FLAG_IV_INO_LBLK_32 0x10 23 - #define FSCRYPT_POLICY_FLAGS_VALID 0x1F 24 23 25 24 /* Encryption algorithms */ 26 25 #define FSCRYPT_MODE_AES_256_XTS 1 ··· 27 28 #define FSCRYPT_MODE_AES_128_CBC 5 28 29 #define FSCRYPT_MODE_AES_128_CTS 6 29 30 #define FSCRYPT_MODE_ADIANTUM 9 30 - #define __FSCRYPT_MODE_MAX 9 31 + /* If adding a mode number > 9, update FSCRYPT_MODE_MAX in fscrypt_private.h */ 31 32 32 33 /* 33 34 * Legacy policy version; ad-hoc KDF and no key verification. ··· 176 177 #define FS_POLICY_FLAGS_PAD_32 FSCRYPT_POLICY_FLAGS_PAD_32 177 178 #define FS_POLICY_FLAGS_PAD_MASK FSCRYPT_POLICY_FLAGS_PAD_MASK 178 179 #define FS_POLICY_FLAG_DIRECT_KEY FSCRYPT_POLICY_FLAG_DIRECT_KEY 179 - #define FS_POLICY_FLAGS_VALID FSCRYPT_POLICY_FLAGS_VALID 180 + #define FS_POLICY_FLAGS_VALID 0x07 /* contains old flags only */ 180 181 #define FS_ENCRYPTION_MODE_INVALID 0 /* never used */ 181 182 #define FS_ENCRYPTION_MODE_AES_256_XTS FSCRYPT_MODE_AES_256_XTS 182 183 #define FS_ENCRYPTION_MODE_AES_256_GCM 2 /* never used */