2020-02-10 07:25:18

by Chen Wandun

Subject: [PATCH next] xprtrdma: make the symbol 'xprt_rdma_slot_table_entries' static

Fix the following sparse warning:
net/sunrpc/xprtrdma/transport.c:71:14: warning: symbol 'xprt_rdma_slot_table_entries' was not declared. Should it be static?

Fixes: 86c4ccd9b92b ("xprtrdma: Eliminate struct rpcrdma_create_data_internal")
Signed-off-by: Chen Wandun <[email protected]>
---
net/sunrpc/xprtrdma/transport.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c
index 3cfeba68ee9a..14c2a852d2a1 100644
--- a/net/sunrpc/xprtrdma/transport.c
+++ b/net/sunrpc/xprtrdma/transport.c
@@ -68,7 +68,7 @@
* tunables
*/

-unsigned int xprt_rdma_slot_table_entries = RPCRDMA_DEF_SLOT_TABLE;
+static unsigned int xprt_rdma_slot_table_entries = RPCRDMA_DEF_SLOT_TABLE;
unsigned int xprt_rdma_max_inline_read = RPCRDMA_DEF_INLINE;
unsigned int xprt_rdma_max_inline_write = RPCRDMA_DEF_INLINE;
unsigned int xprt_rdma_memreg_strategy = RPCRDMA_FRWR;
--
2.17.1

2020-02-10 16:09:56

by Chuck Lever III

Subject: Re: [PATCH next] xprtrdma: make the symbol 'xprt_rdma_slot_table_entries' static

Hi-

The Fixes: tag seems incorrect to me.


> On Feb 10, 2020, at 2:39 AM, Chen Wandun <[email protected]> wrote:
>
> Fix the following sparse warning:
> net/sunrpc/xprtrdma/transport.c:71:14: warning: symbol 'xprt_rdma_slot_table_entries' was not declared. Should it be static?
>
> Fixes: 86c4ccd9b92b ("xprtrdma: Eliminate struct rpcrdma_create_data_internal")

86c4ccd9b92b correctly makes xprt_rdma_slot_table_entries a
global variable. This later commit (in v5.6-rc1)

7581d90109ca ("xprtrdma: Refactor initialization of ep->rep_max_requests")

should have changed xprt_rdma_slot_table_entries back to a static.

I'm not sure what the call is on sparse warnings these days, but
it doesn't seem like this clean up should be backported to stable.
Should Fixes: be removed?


> Signed-off-by: Chen Wandun <[email protected]>
> ---
> net/sunrpc/xprtrdma/transport.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c
> index 3cfeba68ee9a..14c2a852d2a1 100644
> --- a/net/sunrpc/xprtrdma/transport.c
> +++ b/net/sunrpc/xprtrdma/transport.c
> @@ -68,7 +68,7 @@
> * tunables
> */
>
> -unsigned int xprt_rdma_slot_table_entries = RPCRDMA_DEF_SLOT_TABLE;
> +static unsigned int xprt_rdma_slot_table_entries = RPCRDMA_DEF_SLOT_TABLE;
> unsigned int xprt_rdma_max_inline_read = RPCRDMA_DEF_INLINE;
> unsigned int xprt_rdma_max_inline_write = RPCRDMA_DEF_INLINE;
> unsigned int xprt_rdma_memreg_strategy = RPCRDMA_FRWR;
> --
> 2.17.1

--
Chuck Lever