2015-11-24 23:11:55

by Colin King

Subject: [PATCH] xprtrdma: add missing curly braces, set rc to zero on non-zero

From: Colin Ian King <[email protected]>

Add the missing curly braces so that rc is only set to zero when
it is non-zero. Without this minor fix, rc is set to zero even
when it is zero, which is slightly redundant.

Detected with smatch static analysis.

Signed-off-by: Colin Ian King <[email protected]>
---
net/sunrpc/xprtrdma/verbs.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
index eadd1655..2cc1014 100644
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@ -852,10 +852,11 @@ retry:

if (extras) {
rc = rpcrdma_ep_post_extra_recv(r_xprt, extras);
- if (rc)
+ if (rc) {
pr_warn("%s: rpcrdma_ep_post_extra_recv: %i\n",
__func__, rc);
rc = 0;
+ }
}
}

--
2.6.2

2015-12-02 15:28:53

by Anna Schumaker

Subject: Re: [PATCH] xprtrdma: add missing curly braces, set rc to zero on non-zero

On 11/24/2015 06:11 PM, Colin King wrote:
> From: Colin Ian King <[email protected]>
>
> Add the missing curly braces so that rc is only set to zero when
> it is non-zero. Without this minor fix, rc is set to zero even
> when it is zero, which is slightly redundant.
>
> Detected with smatch static analysis.

Thanks for the patch, but I've already have a patch from Dan Carpenter queued up to fix this.

Anna

>
> Signed-off-by: Colin Ian King <[email protected]>
> ---
> net/sunrpc/xprtrdma/verbs.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
> index eadd1655..2cc1014 100644
> --- a/net/sunrpc/xprtrdma/verbs.c
> +++ b/net/sunrpc/xprtrdma/verbs.c
> @@ -852,10 +852,11 @@ retry:
>
> if (extras) {
> rc = rpcrdma_ep_post_extra_recv(r_xprt, extras);
> - if (rc)
> + if (rc) {
> pr_warn("%s: rpcrdma_ep_post_extra_recv: %i\n",
> __func__, rc);
> rc = 0;
> + }
> }
> }
>
>