hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SUNRPC: RPC level errors should always set task->tk_rpc_status 

Ensure that we set task->tk_rpc_status for all RPC level errors so that
the caller can distinguish between those and server reply status errors.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
This commit is contained in:
Trond Myklebust 2019-09-12 08:06:51 -04:00 committed by Anna Schumaker
parent 45835a63d0
commit 714fbc7388
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/sunrpc/clnt.c
View File

@ -1837,7 +1837,7 @@ call_allocate(struct rpc_task *task)
return; return;
} }
rpc_exit(task, -ERESTARTSYS); rpc_call_rpcerror(task, -ERESTARTSYS);
} }
static int static int
@ -2544,7 +2544,7 @@ rpc_encode_header(struct rpc_task *task, struct xdr_stream *xdr)
return 0; return 0;
out_fail: out_fail:
trace_rpc_bad_callhdr(task); trace_rpc_bad_callhdr(task);
rpc_exit(task, error); rpc_call_rpcerror(task, error);
return error; return error;
} }
@ -2611,7 +2611,7 @@ out_garbage:
return -EAGAIN; return -EAGAIN;
} }
out_err: out_err:
rpc_exit(task, error); rpc_call_rpcerror(task, error);
return error; return error;
out_unparsable: out_unparsable:

5
net/sunrpc/sched.c
View File

@ -911,8 +911,10 @@ static void __rpc_execute(struct rpc_task *task)
/* /*
* Signalled tasks should exit rather than sleep. * Signalled tasks should exit rather than sleep.
*/ */
if (RPC_SIGNALLED(task)) if (RPC_SIGNALLED(task)) {
task->tk_rpc_status = -ERESTARTSYS;
rpc_exit(task, -ERESTARTSYS); rpc_exit(task, -ERESTARTSYS);
}
/* /*
* The queue->lock protects against races with * The queue->lock protects against races with
@ -948,6 +950,7 @@ static void __rpc_execute(struct rpc_task *task)
*/ */
dprintk("RPC: %5u got signal\n", task->tk_pid); dprintk("RPC: %5u got signal\n", task->tk_pid);
set_bit(RPC_TASK_SIGNALLED, &task->tk_runstate); set_bit(RPC_TASK_SIGNALLED, &task->tk_runstate);
task->tk_rpc_status = -ERESTARTSYS;
rpc_exit(task, -ERESTARTSYS); rpc_exit(task, -ERESTARTSYS);
} }
dprintk("RPC: %5u sync task resuming\n", task->tk_pid); dprintk("RPC: %5u sync task resuming\n", task->tk_pid);