Commit 968121f0 authored by Namhyung Kim's avatar Namhyung Kim
Browse files

perf tools: Fix build error on generated/fs_at_flags_array.c 



It should only have generic flags in the array but the recent header
sync brought a new flags to fcntl.h and caused a build error.  Let's
update the shell script to exclude flags specific to name_to_handle_at().

    CC      trace/beauty/fs_at_flags.o
  In file included from trace/beauty/fs_at_flags.c:21:
  tools/perf/trace/beauty/generated/fs_at_flags_array.c:13:30: error: initialized field overwritten [-Werror=override-init]
     13 |         [ilog2(0x002) + 1] = "HANDLE_CONNECTABLE",
        |                              ^~~~~~~~~~~~~~~~~~~~
  tools/perf/trace/beauty/generated/fs_at_flags_array.c:13:30: note: (near initialization for ‘fs_at_flags[2]’)

Reviewed-by: default avatarJames Clark <james.clark@linaro.org>
Link: https://lore.kernel.org/r/20241203035349.1901262-12-namhyung@kernel.org


Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
parent c994ac74

tools/perf/trace/beauty/fs_at_flags.sh

+2 −1
Original line number Diff line number Diff line
@@ -13,13 +13,14 @@ printf "static const char *fs_at_flags[] = {\n" 
regex='^[[:space:]]*#[[:space:]]*define[[:space:]]+AT_([^_]+[[:alnum:]_]+)[[:space:]]+(0x[[:xdigit:]]+)[[:space:]]*.*'

# AT_EACCESS is only meaningful to faccessat, so we will special case it there...

# AT_STATX_SYNC_TYPE is not a bit, its a mask of AT_STATX_SYNC_AS_STAT, AT_STATX_FORCE_SYNC and AT_STATX_DONT_SYNC

# AT_HANDLE_FID and AT_HANDLE_MNT_ID_UNIQUE are reusing values and are valid only for name_to_handle_at()

# AT_HANDLE_FID, AT_HANDLE_MNT_ID_UNIQUE and AT_HANDLE_CONNECTABLE are reusing values and are valid only for name_to_handle_at()

# AT_RENAME_NOREPLACE reuses 0x1 and is valid only for renameat2()

grep -E $regex ${linux_fcntl} | \

	grep -v AT_EACCESS | \

	grep -v AT_STATX_SYNC_TYPE | \

	grep -v AT_HANDLE_FID | \

	grep -v AT_HANDLE_MNT_ID_UNIQUE | \

	grep -v AT_HANDLE_CONNECTABLE | \

	grep -v AT_RENAME_NOREPLACE | \

	sed -r "s/$regex/\2 \1/g"	| \

	xargs printf "\t[ilog2(%s) + 1] = \"%s\",\n"