* [PATCH] NET: sunrpc, remove unneeded NULL tests
@ 2010-10-27 11:52 Jiri Slaby
[not found] ` <1288180325-20009-1-git-send-email-jslaby-AlSwsSmVLrQ@public.gmane.org>
0 siblings, 1 reply; 2+ messages in thread
From: Jiri Slaby @ 2010-10-27 11:52 UTC (permalink / raw)
To: bfields; +Cc: davem, netdev, linux-kernel, jirislaby, Neil Brown, linux-nfs
Stanse found that req in xprt_reserve_xprt is dereferenced prior its
test to NULL. If that's the case, the checks are unnecessary, so
remove them.
The alternative is not to dereference it before the test. The patch
is to point out the problem, you have to decide.
Signed-off-by: Jiri Slaby <jslaby@suse•cz>
Cc: "J. Bruce Fields" <bfields@fieldses•org>
Cc: Neil Brown <neilb@suse•de>
Cc: linux-nfs@vger•kernel.org
---
net/sunrpc/xprt.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index 4c8f18a..5355c71 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -202,10 +202,8 @@ int xprt_reserve_xprt(struct rpc_task *task)
goto out_sleep;
}
xprt->snd_task = task;
- if (req) {
- req->rq_bytes_sent = 0;
- req->rq_ntrans++;
- }
+ req->rq_bytes_sent = 0;
+ req->rq_ntrans++;
return 1;
out_sleep:
@@ -213,7 +211,7 @@ out_sleep:
task->tk_pid, xprt);
task->tk_timeout = 0;
task->tk_status = -EAGAIN;
- if (req && req->rq_ntrans)
+ if (req->rq_ntrans)
rpc_sleep_on(&xprt->resend, task, NULL);
else
rpc_sleep_on(&xprt->sending, task, NULL);
--
1.7.3.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] NET: sunrpc, remove unneeded NULL tests
[not found] ` <1288180325-20009-1-git-send-email-jslaby-AlSwsSmVLrQ@public.gmane.org>
@ 2010-11-12 19:14 ` J. Bruce Fields
0 siblings, 0 replies; 2+ messages in thread
From: J. Bruce Fields @ 2010-11-12 19:14 UTC (permalink / raw)
To: Jiri Slaby
Cc: davem-fT/PcQaiUtIeIZ0/mPfg9Q, netdev-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
jirislaby-Re5JQEeQqe8AvxtiuMwx3w, Neil Brown,
linux-nfs-u79uwXL29TY76Z2rM5mHXA, Trond Myklebust
Sorry for the slow response, this one's for Trond if it hasn't already
been handled.
--b.
On Wed, Oct 27, 2010 at 01:52:05PM +0200, Jiri Slaby wrote:
> Stanse found that req in xprt_reserve_xprt is dereferenced prior its
> test to NULL. If that's the case, the checks are unnecessary, so
> remove them.
>
> The alternative is not to dereference it before the test. The patch
> is to point out the problem, you have to decide.
>
> Signed-off-by: Jiri Slaby <jslaby-AlSwsSmVLrQ@public•gmane.org>
> Cc: "J. Bruce Fields" <bfields-uC3wQj2KruNg9hUCZPvPmw@public•gmane.org>
> Cc: Neil Brown <neilb-l3A5Bk7waGM@public•gmane.org>
> Cc: linux-nfs-u79uwXL29TY76Z2rM5mHXA@public•gmane.org
> ---
> net/sunrpc/xprt.c | 8 +++-----
> 1 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
> index 4c8f18a..5355c71 100644
> --- a/net/sunrpc/xprt.c
> +++ b/net/sunrpc/xprt.c
> @@ -202,10 +202,8 @@ int xprt_reserve_xprt(struct rpc_task *task)
> goto out_sleep;
> }
> xprt->snd_task = task;
> - if (req) {
> - req->rq_bytes_sent = 0;
> - req->rq_ntrans++;
> - }
> + req->rq_bytes_sent = 0;
> + req->rq_ntrans++;
> return 1;
>
> out_sleep:
> @@ -213,7 +211,7 @@ out_sleep:
> task->tk_pid, xprt);
> task->tk_timeout = 0;
> task->tk_status = -EAGAIN;
> - if (req && req->rq_ntrans)
> + if (req->rq_ntrans)
> rpc_sleep_on(&xprt->resend, task, NULL);
> else
> rpc_sleep_on(&xprt->sending, task, NULL);
> --
> 1.7.3.1
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public•gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-11-12 19:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-27 11:52 [PATCH] NET: sunrpc, remove unneeded NULL tests Jiri Slaby
[not found] ` <1288180325-20009-1-git-send-email-jslaby-AlSwsSmVLrQ@public.gmane.org>
2010-11-12 19:14 ` J. Bruce Fields
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox