linux-kernel - Re: [PATCH] orangefs: move s_kmod_keyword_mask

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <dd1a326a-e165-4796-9005-6bff2019deef@wanadoo.fr>
Date: Tue, 25 Feb 2025 21:24:56 +0100
From: Christophe JAILLET <christophe.jaillet@...adoo.fr>
To: Arnd Bergmann <arnd@...nel.org>, Mike Marshall <hubcap@...ibond.com>
Cc: Arnd Bergmann <arnd@...db.de>, Martin Brandenburg <martin@...ibond.com>,
 Al Viro <viro@...iv.linux.org.uk>,
 Greg Kroah-Hartman <gregkh@...uxfoundation.org>, devel@...ts.orangefs.org,
 linux-kernel@...r.kernel.org
Subject: Re: [PATCH] orangefs: move s_kmod_keyword_mask_map[] into debugfs.c

Le 25/02/2025 à 21:08, Arnd Bergmann a écrit :
> From: Arnd Bergmann <arnd@...db.de>
> 
> gcc warns about unused const variables when building with W=1
> 
>      In file included from fs/orangefs/protocol.h:287,
>                       from fs/orangefs/acl.c:8:
>      fs/orangefs/orangefs-debug.h:86:18: error: 'num_kmod_keyword_mask_map' defined but not used [-Werror=unused-const-variable=]
>         86 | static const int num_kmod_keyword_mask_map = (int)
>            |                  ^~~~~~~~~~~~~~~~~~~~~~~~~
> 
> This one is only used in one file, so just move the definition
> next to its only user.
> 
> Signed-off-by: Arnd Bergmann <arnd@...db.de>
> ---
>   fs/orangefs/orangefs-debug.h   | 43 ----------------------------------
>   fs/orangefs/orangefs-debugfs.c | 43 ++++++++++++++++++++++++++++++++++
>   2 files changed, 43 insertions(+), 43 deletions(-)
> 
> diff --git a/fs/orangefs/orangefs-debug.h b/fs/orangefs/orangefs-debug.h
> index 6e079d4230d0..d4463534cec6 100644
> --- a/fs/orangefs/orangefs-debug.h
> +++ b/fs/orangefs/orangefs-debug.h
> @@ -43,47 +43,4 @@
>   #define GOSSIP_MAX_NR                 16
>   #define GOSSIP_MAX_DEBUG              (((__u64)1 << GOSSIP_MAX_NR) - 1)
>   
> -/* a private internal type */
> -struct __keyword_mask_s {
> -	const char *keyword;
> -	__u64 mask_val;
> -};
> -
> -/*
> - * Map all kmod keywords to kmod debug masks here. Keep this
> - * structure "packed":
> - *
> - *   "all" is always last...
> - *
> - *   keyword     mask_val     index
> - *     foo          1           0
> - *     bar          2           1
> - *     baz          4           2
> - *     qux          8           3
> - *      .           .           .
> - */
> -static struct __keyword_mask_s s_kmod_keyword_mask_map[] = {
> -	{"super", GOSSIP_SUPER_DEBUG},
> -	{"inode", GOSSIP_INODE_DEBUG},
> -	{"file", GOSSIP_FILE_DEBUG},
> -	{"dir", GOSSIP_DIR_DEBUG},
> -	{"utils", GOSSIP_UTILS_DEBUG},
> -	{"wait", GOSSIP_WAIT_DEBUG},
> -	{"acl", GOSSIP_ACL_DEBUG},
> -	{"dcache", GOSSIP_DCACHE_DEBUG},
> -	{"dev", GOSSIP_DEV_DEBUG},
> -	{"name", GOSSIP_NAME_DEBUG},
> -	{"bufmap", GOSSIP_BUFMAP_DEBUG},
> -	{"cache", GOSSIP_CACHE_DEBUG},
> -	{"debugfs", GOSSIP_DEBUGFS_DEBUG},
> -	{"xattr", GOSSIP_XATTR_DEBUG},
> -	{"init", GOSSIP_INIT_DEBUG},
> -	{"sysfs", GOSSIP_SYSFS_DEBUG},
> -	{"none", GOSSIP_NO_DEBUG},
> -	{"all", GOSSIP_MAX_DEBUG}
> -};
> -
> -static const int num_kmod_keyword_mask_map = (int)
> -	(ARRAY_SIZE(s_kmod_keyword_mask_map));
> -
>   #endif /* __ORANGEFS_DEBUG_H */
> diff --git a/fs/orangefs/orangefs-debugfs.c b/fs/orangefs/orangefs-debugfs.c
> index f52073022fae..6a34e6feac45 100644
> --- a/fs/orangefs/orangefs-debugfs.c
> +++ b/fs/orangefs/orangefs-debugfs.c
> @@ -54,6 +54,49 @@
>   #define ORANGEFS_VERBOSE "verbose"
>   #define ORANGEFS_ALL "all"
>   
> +/* a private internal type */
> +struct __keyword_mask_s {
> +	const char *keyword;
> +	__u64 mask_val;
> +};
> +
> +/*
> + * Map all kmod keywords to kmod debug masks here. Keep this
> + * structure "packed":
> + *
> + *   "all" is always last...
> + *
> + *   keyword     mask_val     index
> + *     foo          1           0
> + *     bar          2           1
> + *     baz          4           2
> + *     qux          8           3
> + *      .           .           .
> + */
> +static struct __keyword_mask_s s_kmod_keyword_mask_map[] = {

Unrelated to your patch, but I think that this could be made const.

Just my 2c.

CJ

> +	{"super", GOSSIP_SUPER_DEBUG},
> +	{"inode", GOSSIP_INODE_DEBUG},
> +	{"file", GOSSIP_FILE_DEBUG},
> +	{"dir", GOSSIP_DIR_DEBUG},
> +	{"utils", GOSSIP_UTILS_DEBUG},
> +	{"wait", GOSSIP_WAIT_DEBUG},
> +	{"acl", GOSSIP_ACL_DEBUG},
> +	{"dcache", GOSSIP_DCACHE_DEBUG},
> +	{"dev", GOSSIP_DEV_DEBUG},
> +	{"name", GOSSIP_NAME_DEBUG},
> +	{"bufmap", GOSSIP_BUFMAP_DEBUG},
> +	{"cache", GOSSIP_CACHE_DEBUG},
> +	{"debugfs", GOSSIP_DEBUGFS_DEBUG},
> +	{"xattr", GOSSIP_XATTR_DEBUG},
> +	{"init", GOSSIP_INIT_DEBUG},
> +	{"sysfs", GOSSIP_SYSFS_DEBUG},
> +	{"none", GOSSIP_NO_DEBUG},
> +	{"all", GOSSIP_MAX_DEBUG}
> +};
> +
> +static const int num_kmod_keyword_mask_map = (int)
> +	(ARRAY_SIZE(s_kmod_keyword_mask_map));
> +
>   /*
>    * An array of client_debug_mask will be built to hold debug keyword/mask
>    * values fetched from userspace.