| Message ID | 20170713175115.9044-1-colin.king@canonical.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
> On Jul 13, 2017, at 1:51 PM, Colin King <colin.king@canonical.com> wrote: > > From: Colin Ian King <colin.king@canonical.com> > > The current check will always be true and will always jump to > err1, this looks dubious to me. I believe && should be used > instead of ||. > > Detected by CoverityScan, CID#1450120 ("Logically Dead Code") > > Fixes: 107c1d0a991a ("svcrdma: Avoid Send Queue overflow") > Signed-off-by: Colin Ian King <colin.king@canonical.com> Reviewed-by: Chuck Lever <chuck.lever@oracle.com> Dan reported this today, and I have a similar patch in my "pending for-rc" series. This one works too. > --- > net/sunrpc/xprtrdma/svc_rdma_sendto.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c > index 19fd01e4b690..7c3a211e0e9a 100644 > --- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c > +++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c > @@ -684,7 +684,7 @@ int svc_rdma_sendto(struct svc_rqst *rqstp) > return 0; > > err2: > - if (ret != -E2BIG || ret != -EINVAL) > + if (ret != -E2BIG && ret != -EINVAL) > goto err1; > > ret = svc_rdma_post_recv(rdma, GFP_KERNEL); > -- > 2.11.0 > -- Chuck Lever -- 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
On Thu, Jul 13, 2017 at 01:53:10PM -0400, Chuck Lever wrote: > > > On Jul 13, 2017, at 1:51 PM, Colin King <colin.king@canonical.com> wrote: > > > > From: Colin Ian King <colin.king@canonical.com> > > > > The current check will always be true and will always jump to > > err1, this looks dubious to me. I believe && should be used > > instead of ||. > > > > Detected by CoverityScan, CID#1450120 ("Logically Dead Code") > > > > Fixes: 107c1d0a991a ("svcrdma: Avoid Send Queue overflow") > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > > Reviewed-by: Chuck Lever <chuck.lever@oracle.com> > > Dan reported this today, and I have a similar patch in my > "pending for-rc" series. This one works too. Applied and merged upstream, thanks. --b. -- 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
diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c index 19fd01e4b690..7c3a211e0e9a 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c +++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c @@ -684,7 +684,7 @@ int svc_rdma_sendto(struct svc_rqst *rqstp) return 0; err2: - if (ret != -E2BIG || ret != -EINVAL) + if (ret != -E2BIG && ret != -EINVAL) goto err1; ret = svc_rdma_post_recv(rdma, GFP_KERNEL);