mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Chuck Lever <chuck.lever@oracle.com>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Bruce Fields <bfields@fieldses.org>,
	Jeff Layton <jlayton@kernel.org>,
	Trond Myklebust <trond.myklebust@hammerspace.com>,
	Anna Schumaker <anna.schumaker@netapp.com>,
	"David S . Miller" <davem@davemloft.net>,
	Linux NFS Mailing List <linux-nfs@vger.kernel.org>,
	netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] SUNRPC: Move inline xprt_alloc_xid() up to fix compiler warning
Date: Thu, 14 Jun 2018 13:19:07 -0400	[thread overview]
Message-ID: <675726D3-9273-4051-B38F-6377B8445A27@oracle.com> (raw)
In-Reply-To: <1528891298-26694-1-git-send-email-geert@linux-m68k.org>



> On Jun 13, 2018, at 8:01 AM, Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> 
> With gcc 4.1.2:
> 
>    net/sunrpc/xprt.c:69: warning: ‘xprt_alloc_xid’ declared inline after being called
>    net/sunrpc/xprt.c:69: warning: previous declaration of ‘xprt_alloc_xid’ was here
> 
> To fix this, move the function up, before its caller, and remove the no
> longer needed forward declaration.
> 
> Fixes: 37ac86c3a76c1136 ("SUNRPC: Initialize rpc_rqst outside of xprt->reserve_lock")
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> ---
> net/sunrpc/xprt.c | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
> 
> diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
> index 3c85af058227d14b..60a8b9f91cf94b54 100644
> --- a/net/sunrpc/xprt.c
> +++ b/net/sunrpc/xprt.c
> @@ -66,7 +66,6 @@
>  * Local functions
>  */
> static void	 xprt_init(struct rpc_xprt *xprt, struct net *net);
> -static __be32	xprt_alloc_xid(struct rpc_xprt *xprt);
> static void	xprt_connect_status(struct rpc_task *task);
> static int      __xprt_get_cong(struct rpc_xprt *, struct rpc_task *);
> static void     __xprt_put_cong(struct rpc_xprt *, struct rpc_rqst *);
> @@ -956,6 +955,11 @@ static void xprt_timer(struct rpc_task *task)
> 		task->tk_status = 0;
> }
> 
> +static inline __be32 xprt_alloc_xid(struct rpc_xprt *xprt)
> +{
> +	return (__force __be32)xprt->xid++;
> +}
> +
> /**
>  * xprt_prepare_transmit - reserve the transport before sending a request
>  * @task: RPC task about to send a request
> @@ -1296,11 +1300,6 @@ void xprt_retry_reserve(struct rpc_task *task)
> 	xprt->ops->alloc_slot(xprt, task);
> }
> 
> -static inline __be32 xprt_alloc_xid(struct rpc_xprt *xprt)
> -{
> -	return (__force __be32)xprt->xid++;
> -}
> -

For code organization, we might want to keep xprt_alloc_xid
together with xprt_init_xid. Would it be better to simply
remove the "inline" directive from these two and let the
compiler choose the best optimization?


> static inline void xprt_init_xid(struct rpc_xprt *xprt)
> {
> 	xprt->xid = prandom_u32();
> -- 
> 2.7.4
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

--
Chuck Lever




  reply	other threads:[~2018-06-14 17:19 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-13 12:01 Geert Uytterhoeven
2018-06-14 17:19 ` Chuck Lever [this message]
2018-06-15  8:23   ` Geert Uytterhoeven

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=675726D3-9273-4051-B38F-6377B8445A27@oracle.com \
    --to=chuck.lever@oracle.com \
    --cc=anna.schumaker@netapp.com \
    --cc=bfields@fieldses.org \
    --cc=davem@davemloft.net \
    --cc=geert@linux-m68k.org \
    --cc=jlayton@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nfs@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=trond.myklebust@hammerspace.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

all inboxes | Powered by JetHome®