Commit 714fbc73 authored by Trond Myklebust's avatar Trond Myklebust Committed by Anna Schumaker
Browse files

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: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 45835a63

net/sunrpc/clnt.c

+3 −3
Original line number Diff line number Diff line
@@ -1837,7 +1837,7 @@ call_allocate(struct rpc_task *task) 
		return;

	}



	rpc_exit(task, -ERESTARTSYS);

	rpc_call_rpcerror(task, -ERESTARTSYS);

}



static int
@@ -2544,7 +2544,7 @@ rpc_encode_header(struct rpc_task *task, struct xdr_stream *xdr) 
	return 0;

out_fail:

	trace_rpc_bad_callhdr(task);

	rpc_exit(task, error);

	rpc_call_rpcerror(task, error);

	return error;

}
@@ -2611,7 +2611,7 @@ rpc_decode_header(struct rpc_task *task, struct xdr_stream *xdr) 
		return -EAGAIN;

	}

out_err:

	rpc_exit(task, error);

	rpc_call_rpcerror(task, error);

	return error;



out_unparsable:

net/sunrpc/sched.c

+4 −1
Original line number Diff line number Diff line
@@ -911,8 +911,10 @@ static void __rpc_execute(struct rpc_task *task) 
		/*

		 * Signalled tasks should exit rather than sleep.

		 */

		if (RPC_SIGNALLED(task))

		if (RPC_SIGNALLED(task)) {

			task->tk_rpc_status = -ERESTARTSYS;

			rpc_exit(task, -ERESTARTSYS);

		}



		/*

		 * 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);

			set_bit(RPC_TASK_SIGNALLED, &task->tk_runstate);

			task->tk_rpc_status = -ERESTARTSYS;

			rpc_exit(task, -ERESTARTSYS);

		}

		dprintk("RPC: %5u sync task resuming\n", task->tk_pid);