diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-02-01 08:46:20 +0100 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-02-07 00:47:59 +0100 |
| commit | 87e3c0553fcbea79bf9f17fc5694484ecf3ae5e8 (patch) | |
| tree | 7d0dcc070b4fdb9cbb7defa212feb4ba82519a26 | |
| parent | NFS: Call test_stateid() and free_stateid() with correct stateids (diff) | |
| download | linux-87e3c0553fcbea79bf9f17fc5694484ecf3ae5e8.tar.xz linux-87e3c0553fcbea79bf9f17fc5694484ecf3ae5e8.zip | |
SUNRPC: remove an unneeded NULL check in xprt_connect()
We check "task->tk_rqstp" and then we dereference it without checking on
the next line. The only caller is call_connect() and that has a check
which prevents it from calling xprt_connect() with a NULL.
if (task->tk_status < 0)
return;
If "task->tk_rqstp" were NULL then "tk_status" would be -EAGAIN.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
| -rw-r--r-- | net/sunrpc/xprt.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index 839f6ef2326b..efe5495ecf65 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c @@ -715,9 +715,7 @@ void xprt_connect(struct rpc_task *task) if (xprt_connected(xprt)) xprt_release_write(xprt, task); else { - if (task->tk_rqstp) - task->tk_rqstp->rq_bytes_sent = 0; - + task->tk_rqstp->rq_bytes_sent = 0; task->tk_timeout = task->tk_rqstp->rq_timeout; rpc_sleep_on(&xprt->pending, task, xprt_connect_status); |