SUNRPC: Remove redundant calls to RPC_IS_QUEUED()

Trond Myklebust · Trond Myklebust · commit 6b5f59001687 · 2019-03-09T16:22:58.000-05:00
The RPC task wakeup calls all check for RPC_IS_QUEUED() before taking any
locks. In addition, rpc_exit() already calls rpc_wake_up_queued_task().

Signed-off-by: Trond Myklebust &lt;trond.myklebust@hammerspace.com&gt;
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
@@ -833,9 +833,6 @@ void rpc_killall_tasks(struct rpc_clnt *clnt)
 		if (!(rovr->tk_flags & RPC_TASK_KILLED)) {
 			rovr->tk_flags |= RPC_TASK_KILLED;
 			rpc_exit(rovr, -EIO);
-			if (RPC_IS_QUEUED(rovr))
-				rpc_wake_up_queued_task(rovr->tk_waitqueue,
-							rovr);
 		}
 	}
 	spin_unlock(&clnt->cl_lock);
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
@@ -785,8 +785,7 @@ void rpc_exit(struct rpc_task *task, int status)
 {
 	task->tk_status = status;
 	task->tk_action = rpc_exit_task;
-	if (RPC_IS_QUEUED(task))
-		rpc_wake_up_queued_task(task->tk_waitqueue, task);
+	rpc_wake_up_queued_task(task->tk_waitqueue, task);
 }
 EXPORT_SYMBOL_GPL(rpc_exit);
 

Original file line number	Diff line number	Diff line change
`@@ -833,9 +833,6 @@ void rpc_killall_tasks(struct rpc_clnt *clnt)`
`833`	`833`	`if (!(rovr->tk_flags & RPC_TASK_KILLED)) {`
`834`	`834`	`rovr->tk_flags \|= RPC_TASK_KILLED;`
`835`	`835`	`rpc_exit(rovr, -EIO);`
`836`		`- if (RPC_IS_QUEUED(rovr))`
`837`		`- rpc_wake_up_queued_task(rovr->tk_waitqueue,`
`838`		`- rovr);`
`839`	`836`	`}`
`840`	`837`	`}`
`841`	`838`	`spin_unlock(&clnt->cl_lock);`
Original file line number	Diff line number	Diff line change
`@@ -785,8 +785,7 @@ void rpc_exit(struct rpc_task *task, int status)`
`785`	`785`	`{`
`786`	`786`	`task->tk_status = status;`
`787`	`787`	`task->tk_action = rpc_exit_task;`
`788`		`- if (RPC_IS_QUEUED(task))`
`789`		`- rpc_wake_up_queued_task(task->tk_waitqueue, task);`
	`788`	`+ rpc_wake_up_queued_task(task->tk_waitqueue, task);`
`790`	`789`	`}`
`791`	`790`	`EXPORT_SYMBOL_GPL(rpc_exit);`
`792`	`791`