Skip to contentSkip to conversation

xprt: remove redundant checks

PATCH In review [email protected] 2 participants 2 messages Mar 16, 2011

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xprt: remove redundant checks

'req' is already dereferenced in 'struct rpc_xprt *xprt = req->rq_xprt;', but check again later in the function. The patch removes these redundant checks.

---
 xprt.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
net/sunrpt/xprt.c renamed from net/sunrpc/xprt.c +3 -5
@@ -202,10 +202,8 @@ int xprt_reserve_xprt(struct rpc_task *t
 		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 lore raw
Quoted 36 lines · On Wed, 2011-03-16 at 02:45 -0400, j223yang-I6MVnP1QzuRPSEYXltEZZrDks+cytr/Z@pu…

'req' is already dereferenced in
'struct rpc_xprt *xprt = req->rq_xprt;',
but check again later in the function.
The patch removes these redundant checks.

---
 xprt.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
net/sunrpt/xprt.c renamed from net/sunrpc/xprt.c +3 -6
@@ -202,10 +202,8 @@ int xprt_reserve_xprt(struct rpc_task *t
 		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);
--
Quoted 3 lines

To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

You already sent hunk 1 in a different patch, and I've already applied that to the nfs-for-2.6.39 branch. Could you therefore please resend this patch with just the second hunk.

Cheers
Trond