Skip to content

Commit 1118446

Browse files
committed
tools headers UAPI: Update tools's copy of fscrypt.h header
tldr; Just FYI, I'm carrying this on the perf tools tree. Full explanation: There used to be no copies, with tools/ code using kernel headers directly. From time to time tools/perf/ broke due to legitimate kernel hacking. At some point Linus complained about such direct usage. Then we adopted the current model. The way these headers are used in perf are not restricted to just including them to compile something. There are sometimes used in scripts that convert defines into string tables, etc, so some change may break one of these scripts, or new MSRs may use some different #define pattern, etc. E.g.: $ ls -1 tools/perf/trace/beauty/*.sh | head -5 tools/perf/trace/beauty/arch_errno_names.sh tools/perf/trace/beauty/drm_ioctl.sh tools/perf/trace/beauty/fadvise.sh tools/perf/trace/beauty/fsconfig.sh tools/perf/trace/beauty/fsmount.sh $ $ tools/perf/trace/beauty/fadvise.sh static const char *fadvise_advices[] = { [0] = "NORMAL", [1] = "RANDOM", [2] = "SEQUENTIAL", [3] = "WILLNEED", [4] = "DONTNEED", [5] = "NOREUSE", }; $ The tools/perf/check-headers.sh script, part of the tools/ build process, points out changes in the original files. So its important not to touch the copies in tools/ when doing changes in the original kernel headers, that will be done later, when check-headers.sh inform about the change to the perf tools hackers. Cc: Eric Biggers <[email protected]> Cc: "Theodore Y. Ts'o" <[email protected]> Cc: Jaegeuk Kim <[email protected]> Cc: [email protected] Signed-off-by: Namhyung Kim <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 1041dfe commit 1118446

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

tools/include/uapi/linux/fscrypt.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ struct fscrypt_policy_v2 {
7171
__u8 contents_encryption_mode;
7272
__u8 filenames_encryption_mode;
7373
__u8 flags;
74-
__u8 __reserved[4];
74+
__u8 log2_data_unit_size;
75+
__u8 __reserved[3];
7576
__u8 master_key_identifier[FSCRYPT_KEY_IDENTIFIER_SIZE];
7677
};
7778

0 commit comments

Comments
 (0)