tools headers UAPI: Sync linux/fscrypt.h with the kernel sources (4a443a51) · Commits · 戴 / test

To pick the changes from: ("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>

tools/include/uapi/linux/fscrypt.h

+2 −3

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@
		#define FSCRYPT_POLICY_FLAG_DIRECT_KEY 0x04
		#define FSCRYPT_POLICY_FLAG_IV_INO_LBLK_64 0x08
		#define FSCRYPT_POLICY_FLAG_IV_INO_LBLK_32 0x10
		#define FSCRYPT_POLICY_FLAGS_VALID 0x1F

		/* Encryption algorithms */
		#define FSCRYPT_MODE_AES_256_XTS 1
		@@ -28,7 +27,7 @@
		#define FSCRYPT_MODE_AES_128_CBC 5
		#define FSCRYPT_MODE_AES_128_CTS 6
		#define FSCRYPT_MODE_ADIANTUM 9
		#define __FSCRYPT_MODE_MAX 9
		/* If adding a mode number > 9, update FSCRYPT_MODE_MAX in fscrypt_private.h */

		/*
		* Legacy policy version; ad-hoc KDF and no key verification.
		@@ -177,7 +176,7 @@ struct fscrypt_get_key_status_arg {
		#define FS_POLICY_FLAGS_PAD_32 FSCRYPT_POLICY_FLAGS_PAD_32
		#define FS_POLICY_FLAGS_PAD_MASK FSCRYPT_POLICY_FLAGS_PAD_MASK
		#define FS_POLICY_FLAG_DIRECT_KEY FSCRYPT_POLICY_FLAG_DIRECT_KEY
		#define FS_POLICY_FLAGS_VALID FSCRYPT_POLICY_FLAGS_VALID
		#define FS_POLICY_FLAGS_VALID 0x07 /* contains old flags only */
		#define FS_ENCRYPTION_MODE_INVALID 0 /* never used */
		#define FS_ENCRYPTION_MODE_AES_256_XTS FSCRYPT_MODE_AES_256_XTS
		#define FS_ENCRYPTION_MODE_AES_256_GCM 2 /* never used */

Admin message