Skip to contentSkip to conversation

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

tip: perf/urgent tip-bot2 for Arnaldo Carvalho de Melo 1 participant 1 message Dec 4, 2019 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

tip-bot2 for Arnaldo Carvalho de Melo

author merge bot Applied
#1 lore raw

The following commit has been merged into the perf/urgent branch of tip:

Commit-ID:     ad46f35cca45e3164137271cd7f06d7e66dae6be
Gitweb:        https://git.kernel.org/tip/ad46f35cca45e3164137271cd7f06d7e66dae6be
Author:        Arnaldo Carvalho de Melo <[email protected]>
AuthorDate:    Mon, 02 Dec 2019 12:19:24 -03:00
Committer:     Arnaldo Carvalho de Melo <[email protected]>
CommitterDate: Mon, 02 Dec 2019 12:19:24 -03:00

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

To pick the changes from:

b103fb7653ff ("fscrypt: add support for IV_INO_LBLK_64 policies")

That don't trigger any changes in tooling.

This silences 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

---
 tools/include/uapi/linux/fscrypt.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
tools/include/uapi/linux/fscrypt.h +2 -1
index 39ccfe9..1beb174 100644
@@ -17,7 +17,8 @@
 #define FSCRYPT_POLICY_FLAGS_PAD_32		0x03
 #define FSCRYPT_POLICY_FLAGS_PAD_MASK		0x03
 #define FSCRYPT_POLICY_FLAG_DIRECT_KEY		0x04
-#define FSCRYPT_POLICY_FLAGS_VALID		0x07
+#define FSCRYPT_POLICY_FLAG_IV_INO_LBLK_64	0x08
+#define FSCRYPT_POLICY_FLAGS_VALID		0x0F
 
 /* Encryption algorithms */
 #define FSCRYPT_MODE_AES_256_XTS		1