public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Jeff Layton <jlayton@kernel.org>
To: Tom Rix <trix@redhat.com>, chuck.lever@oracle.com
Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] nfsd: define exports_proc_ops with CONFIG_PROC_FS
Date: Tue, 02 May 2023 14:16:33 -0400	[thread overview]
Message-ID: <db82df959da68781fa284483821a45d65f3aeddd.camel@kernel.org> (raw)
In-Reply-To: <20230502171121.2929222-1-trix@redhat.com>

On Tue, 2023-05-02 at 13:11 -0400, Tom Rix wrote:
> gcc with W=1 and ! CONFIG_PROC_FS
> fs/nfsd/nfsctl.c:161:30: error: ‘exports_proc_ops’
>   defined but not used [-Werror=unused-const-variable=]
>   161 | static const struct proc_ops exports_proc_ops = {
>       |                              ^~~~~~~~~~~~~~~~
> 
> The only use of exports_proc_ops is when CONFIG_PROC_FS
> is defined, so its definition should be likewise conditional.
> 
> Signed-off-by: Tom Rix <trix@redhat.com>
> ---
>  fs/nfsd/nfsctl.c | 25 +++++++++++++------------
>  1 file changed, 13 insertions(+), 12 deletions(-)
> 
> diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
> index 7b8f17ee5224..c159817d1282 100644
> --- a/fs/nfsd/nfsctl.c
> +++ b/fs/nfsd/nfsctl.c
> @@ -153,18 +153,6 @@ static int exports_net_open(struct net *net, struct file *file)
>  	return 0;
>  }
>  
> -static int exports_proc_open(struct inode *inode, struct file *file)
> -{
> -	return exports_net_open(current->nsproxy->net_ns, file);
> -}
> -
> -static const struct proc_ops exports_proc_ops = {
> -	.proc_open	= exports_proc_open,
> -	.proc_read	= seq_read,
> -	.proc_lseek	= seq_lseek,
> -	.proc_release	= seq_release,
> -};
> -
>  static int exports_nfsd_open(struct inode *inode, struct file *file)
>  {
>  	return exports_net_open(inode->i_sb->s_fs_info, file);
> @@ -1458,6 +1446,19 @@ static struct file_system_type nfsd_fs_type = {
>  MODULE_ALIAS_FS("nfsd");
>  
>  #ifdef CONFIG_PROC_FS
> +
> +static int exports_proc_open(struct inode *inode, struct file *file)
> +{
> +	return exports_net_open(current->nsproxy->net_ns, file);
> +}
> +
> +static const struct proc_ops exports_proc_ops = {
> +	.proc_open	= exports_proc_open,
> +	.proc_read	= seq_read,
> +	.proc_lseek	= seq_lseek,
> +	.proc_release	= seq_release,
> +};
> +
>  static int create_proc_exports_entry(void)
>  {
>  	struct proc_dir_entry *entry;

Reviewed-by: Jeff Layton <jlayton@kernel.org>

      parent reply	other threads:[~2023-05-02 18:16 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-02 17:11 [PATCH] nfsd: define exports_proc_ops with CONFIG_PROC_FS Tom Rix
2023-05-02 17:42 ` Chuck Lever III
2023-05-02 18:16 ` Jeff Layton [this message]

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=db82df959da68781fa284483821a45d65f3aeddd.camel@kernel.org \
    --to=jlayton@kernel.org \
    --cc=chuck.lever@oracle.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nfs@vger.kernel.org \
    --cc=trix@redhat.com \
    /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