2019-01-16 10:33:05

by Wei Yongjun

Subject: [PATCH net-next] xprtrdma: Fix error return code in rpcrdma_buffer_create()

Fix to return a negative error code -ENOMEM from the error handling
case instead of 0, as done elsewhere in this function.

Fixes: 6d2d0ee27c7a ("xprtrdma: Replace rpcrdma_receive_wq with a per-xprt workqueue")
Signed-off-by: Wei Yongjun <[email protected]>
---
net/sunrpc/xprtrdma/verbs.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
index 7749a2b..3dde058 100644
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@ -1113,8 +1113,10 @@ struct rpcrdma_req *
WQ_MEM_RECLAIM | WQ_HIGHPRI,
0,
r_xprt->rx_xprt.address_strings[RPC_DISPLAY_ADDR]);
- if (!buf->rb_completion_wq)
+ if (!buf->rb_completion_wq) {
+ rc = -ENOMEM;
goto out;
+ }

return 0;
out:

2019-01-16 15:19:08

by Chuck Lever III

Subject: Re: [PATCH net-next] xprtrdma: Fix error return code in rpcrdma_buffer_create()

On Jan 16, 2019, at 5:38 AM, Wei Yongjun <[email protected]> wrote:

> Fix to return a negative error code -ENOMEM from the error handling
> case instead of 0, as done elsewhere in this function.
>
> Fixes: 6d2d0ee27c7a ("xprtrdma: Replace rpcrdma_receive_wq with a per-xprt workqueue")
> Signed-off-by: Wei Yongjun <[email protected]>

I thought we'd already fixed this one, but:

Reviewed-by: Chuck Lever <[email protected]>


> ---
> net/sunrpc/xprtrdma/verbs.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
> index 7749a2b..3dde058 100644
> --- a/net/sunrpc/xprtrdma/verbs.c
> +++ b/net/sunrpc/xprtrdma/verbs.c
> @@ -1113,8 +1113,10 @@ struct rpcrdma_req *
> WQ_MEM_RECLAIM | WQ_HIGHPRI,
> 0,
> r_xprt->rx_xprt.address_strings[RPC_DISPLAY_ADDR]);
> - if (!buf->rb_completion_wq)
> + if (!buf->rb_completion_wq) {
> + rc = -ENOMEM;
> goto out;
> + }
>
> return 0;
> out:


--
Chuck Lever