Skip to content

Commit 8ef18f9

Browse files
author
Lukas Czerner
committed
tools headers uapi: Sync linux/stat.h with the kernel sources
Bugzilla: https://bugzilla.redhat.com/2150284 Tested: xfstests Upstream Status: upstream commit 49c75d3 Author: Arnaldo Carvalho de Melo <acme@redhat.com> To pick the changes from: 825cf20 ("statx: add direct I/O alignment information") That add a constant that was manually added to tools/perf/trace/beauty/statx.c, at some point this should move to the shell based automated way. This silences this perf build warning: Warning: Kernel ABI header at 'tools/include/uapi/linux/stat.h' differs from latest version at 'include/uapi/linux/stat.h' diff -u tools/include/uapi/linux/stat.h include/uapi/linux/stat.h Cc: Eric Biggers <ebiggers@google.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Ian Rogers <irogers@google.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Link: https://lore.kernel.org/lkml/Y1gGQL5LonnuzeYd@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> (cherry picked from commit 49c75d3) Signed-off-by: Lukas Czerner <lczerner@redhat.com>
1 parent d1139a5 commit 8ef18f9

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

tools/include/uapi/linux/stat.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ struct statx {
124124
__u32 stx_dev_minor;
125125
/* 0x90 */
126126
__u64 stx_mnt_id;
127-
__u64 __spare2;
127+
__u32 stx_dio_mem_align; /* Memory buffer alignment for direct I/O */
128+
__u32 stx_dio_offset_align; /* File offset alignment for direct I/O */
128129
/* 0xa0 */
129130
__u64 __spare3[12]; /* Spare space for future expansion */
130131
/* 0x100 */
@@ -152,6 +153,7 @@ struct statx {
152153
#define STATX_BASIC_STATS 0x000007ffU /* The stuff in the normal stat struct */
153154
#define STATX_BTIME 0x00000800U /* Want/got stx_btime */
154155
#define STATX_MNT_ID 0x00001000U /* Got stx_mnt_id */
156+
#define STATX_DIOALIGN 0x00002000U /* Want/got direct I/O alignment info */
155157

156158
#define STATX__RESERVED 0x80000000U /* Reserved for future struct statx expansion */
157159

tools/perf/trace/beauty/statx.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ size_t syscall_arg__scnprintf_statx_mask(char *bf, size_t size, struct syscall_a
6666
P_FLAG(BLOCKS);
6767
P_FLAG(BTIME);
6868
P_FLAG(MNT_ID);
69+
P_FLAG(DIOALIGN);
6970

7071
#undef P_FLAG
7172

0 commit comments

Comments
 (0)