--- net/sunrpc/sched.c

+++ net/sunrpc/sched.c

@@ -627,12 +627,14 @@ static void __rpc_execute(struct rpc_tas

save_callback = task->tk_callback;

task->tk_callback = NULL;

save_callback(task);

- } else {

- /*

- * Perform the next FSM step.

- * tk_action may be NULL when the task has been killed

- * by someone else.

- */

+ }

+

+ /*

+ * Perform the next FSM step.

+ * tk_action may be NULL when the task has been killed

+ * by someone else.

+ */

+ if (!RPC_IS_QUEUED(task)) {

if (task->tk_action == NULL)

break;

task->tk_action(task);