Commit 43a3ce77 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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

To pick the changes from:

  f8b435f9 ("fscrypt: remove unused Speck definitions")
  e0cefada ("fscrypt: Add SM4 XTS/CTS symmetric algorithm support")

That don't result in any changes in tooling, just causes this to be
rebuilt:

  CC      /tmp/build/perf-urgent/trace/beauty/sync_file_range.o
  LD      /tmp/build/perf-urgent/trace/beauty/perf-in.o

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>
Cc: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
Link: https://lore.kernel.org/lkml/Y6CHSS6Rn9YOqpAd@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 51c4f2bf

tools/include/uapi/linux/fscrypt.h

+2 −2
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#define FSCRYPT_MODE_AES_256_CTS		4

#define FSCRYPT_MODE_AES_128_CBC		5

#define FSCRYPT_MODE_AES_128_CTS		6

#define FSCRYPT_MODE_SM4_XTS			7

#define FSCRYPT_MODE_SM4_CTS			8

#define FSCRYPT_MODE_ADIANTUM			9

#define FSCRYPT_MODE_AES_256_HCTR2		10

/* If adding a mode number > 10, update FSCRYPT_MODE_MAX in fscrypt_private.h */
@@ -185,8 +187,6 @@ struct fscrypt_get_key_status_arg { 
#define FS_ENCRYPTION_MODE_AES_256_CTS	FSCRYPT_MODE_AES_256_CTS

#define FS_ENCRYPTION_MODE_AES_128_CBC	FSCRYPT_MODE_AES_128_CBC

#define FS_ENCRYPTION_MODE_AES_128_CTS	FSCRYPT_MODE_AES_128_CTS

#define FS_ENCRYPTION_MODE_SPECK128_256_XTS	7	/* removed */

#define FS_ENCRYPTION_MODE_SPECK128_256_CTS	8	/* removed */

#define FS_ENCRYPTION_MODE_ADIANTUM	FSCRYPT_MODE_ADIANTUM

#define FS_KEY_DESC_PREFIX		FSCRYPT_KEY_DESC_PREFIX

#define FS_KEY_DESC_PREFIX_SIZE		FSCRYPT_KEY_DESC_PREFIX_SIZE