From mboxrd@z Thu Jan 1 00:00:00 1970 From: Geert Uytterhoeven Subject: [PATCH] SUNRPC: Move inline xprt_alloc_xid() up to fix compiler warning Date: Wed, 13 Jun 2018 14:01:38 +0200 Message-ID: <1528891298-26694-1-git-send-email-geert@linux-m68k.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: linux-nfs@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven To: Chuck Lever , "J . Bruce Fields" , Jeff Layton , Trond Myklebust , Anna Schumaker , "David S . Miller" Return-path: Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org 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 --- 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++; -} - static inline void xprt_init_xid(struct rpc_xprt *xprt) { xprt->xid = prandom_u32(); -- 2.7.4