From: Namhyung Kim <namhyung@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Ian Rogers <irogers@google.com>, Jiri Olsa <jolsa@kernel.org>,
Adrian Hunter <adrian.hunter@intel.com>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
linux-perf-users@vger.kernel.org
Subject: [PATCH 11/11] perf tools: Fix build error on generated/fs_at_flags_array.c
Date: Mon, 2 Dec 2024 19:53:49 -0800 [thread overview]
Message-ID: <20241203035349.1901262-12-namhyung@kernel.org> (raw)
In-Reply-To: <20241203035349.1901262-1-namhyung@kernel.org>
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]’)
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/trace/beauty/fs_at_flags.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/perf/trace/beauty/fs_at_flags.sh b/tools/perf/trace/beauty/fs_at_flags.sh
index e3f13f96a27c227c..fac4d0c049fcc89f 100755
--- a/tools/perf/trace/beauty/fs_at_flags.sh
+++ b/tools/perf/trace/beauty/fs_at_flags.sh
@@ -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"
--
2.47.0.338.g60cca15819-goog
next prev parent reply other threads:[~2024-12-03 3:53 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-03 3:53 [PATCHSET 00/11] perf tools: Sync tools and kernel headers for v6.13 Namhyung Kim
2024-12-03 3:53 ` [PATCH 01/11] tools headers: Sync uapi/drm/drm.h with the kernel sources Namhyung Kim
2024-12-03 3:53 ` [PATCH 02/11] tools headers: Sync uapi/linux/perf_event.h " Namhyung Kim
2024-12-03 3:53 ` [PATCH 03/11] tools headers: Sync uapi/linux/kvm.h " Namhyung Kim
2024-12-03 3:53 ` [PATCH 04/11] tools headers: Sync x86 kvm and cpufeature headers with the kernel Namhyung Kim
2024-12-03 3:53 ` [PATCH 05/11] tools headers: Sync arm64 kvm header with the kernel sources Namhyung Kim
2024-12-03 3:53 ` [PATCH 06/11] tools headers: Sync *xattrat syscall changes " Namhyung Kim
2024-12-03 3:53 ` [PATCH 07/11] tools headers: Sync uapi/asm-generic/mman.h " Namhyung Kim
2024-12-03 3:53 ` [PATCH 08/11] tools headers: Sync uapi/linux/fcntl.h " Namhyung Kim
2024-12-03 3:53 ` [PATCH 09/11] tools headers: Sync uapi/linux/mount.h " Namhyung Kim
2024-12-03 3:53 ` [PATCH 10/11] tools headers: Sync uapi/linux/prctl.h " Namhyung Kim
2024-12-03 3:53 ` Namhyung Kim [this message]
2024-12-03 16:43 ` [PATCH 11/11] perf tools: Fix build error on generated/fs_at_flags_array.c James Clark
2024-12-03 21:54 ` Namhyung Kim
2024-12-04 9:39 ` James Clark
2024-12-04 9:59 ` James Clark
2024-12-04 10:00 ` [PATCHSET 00/11] perf tools: Sync tools and kernel headers for v6.13 James Clark
2024-12-05 18:56 ` Namhyung Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241203035349.1901262-12-namhyung@kernel.org \
--to=namhyung@kernel.org \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=irogers@google.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®