Skip to contentSkip to conversation

ext4: Mark ctx_*_flags() with __maybe_unused

PATCH Applied Andy Shevchenko 2 participants 2 messages Sep 5, 2024 – Nov 7, 2024 ext4 file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ext4: Mark ctx_*_flags() with __maybe_unused

When ctx_set_flags() is unused, it prevents kernel builds with clang, make W=1 and CONFIG_WERROR=y:

.../ext4/super.c:2120:1: error: unused function 'ctx_set_flags' [-Werror,-Wunused-function]
2120 | EXT4_SET_CTX(flags); /* set only */

      | ^~~~~~~~~~~~~~~~~~~

Fix this by marking ctx_*_flags() with __maybe_unused (mark both for the sake of symmetry).

See also commit 6863f5643dd7 ("kbuild: allow Clang to find unused static inline functions for W=1 build").

---
 fs/ext4/super.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
fs/ext4/super.c +4 -4
index e72145c4ae5a..8bbd84c2f3ca 100644
@@ -2095,16 +2095,16 @@ static int ext4_parse_test_dummy_encryption(const struct fs_parameter *param,
 }
 
 #define EXT4_SET_CTX(name)						\
-static inline void ctx_set_##name(struct ext4_fs_context *ctx,		\
-				  unsigned long flag)			\
+static inline __maybe_unused						\
+void ctx_set_##name(struct ext4_fs_context *ctx, unsigned long flag)	\
 {									\
 	ctx->mask_s_##name |= flag;					\
 	ctx->vals_s_##name |= flag;					\
 }
 
 #define EXT4_CLEAR_CTX(name)						\
-static inline void ctx_clear_##name(struct ext4_fs_context *ctx,	\
-				    unsigned long flag)			\
+static inline __maybe_unused						\
+void ctx_clear_##name(struct ext4_fs_context *ctx, unsigned long flag)	\
 {									\
 	ctx->mask_s_##name |= flag;					\
 	ctx->vals_s_##name &= ~flag;					\
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
maintainer Applied
#1 lore raw
Quoted 8 lines · Andy Shevchenko

When ctx_set_flags() is unused, it prevents kernel builds with clang, make W=1 and CONFIG_WERROR=y:

.../ext4/super.c:2120:1: error: unused function 'ctx_set_flags' [-Werror,-Wunused-function]
2120 | EXT4_SET_CTX(flags); /* set only */

      | ^~~~~~~~~~~~~~~~~~~

[...]

Applied, thanks!

[1/1] ext4: Mark ctx_*_flags() with __maybe_unused

      commit: 7bdb90e0f6c832c00a4c0a5d841aa367502dbfef

Best regards,

Signature · 1 line
Theodore Ts'o <[email protected]>