Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7494d00c authored by Trond Myklebust's avatar Trond Myklebust
Browse files

SUNRPC: Allow RPC calls to return ETIMEDOUT instead of EIO 



On occasion, it is useful for the NFS layer to distinguish between
soft timeouts and other EIO errors due to (say) encoding errors,
or authentication errors.

The following patch ensures that the default behaviour of the RPC
layer remains to return EIO on soft timeouts (until we have
audited all the callers).

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent fd954ae1

include/linux/sunrpc/sched.h

+2 −1
Original line number Diff line number Diff line
@@ -128,12 +128,13 @@ struct rpc_task_setup { 
#define RPC_TASK_SOFT		0x0200		/* Use soft timeouts */

#define RPC_TASK_SOFTCONN	0x0400		/* Fail if can't connect */

#define RPC_TASK_SENT		0x0800		/* message was sent */

#define RPC_TASK_TIMEOUT	0x1000		/* fail with ETIMEDOUT on timeout */



#define RPC_IS_ASYNC(t)		((t)->tk_flags & RPC_TASK_ASYNC)

#define RPC_IS_SWAPPER(t)	((t)->tk_flags & RPC_TASK_SWAPPER)

#define RPC_DO_ROOTOVERRIDE(t)	((t)->tk_flags & RPC_TASK_ROOTCREDS)

#define RPC_ASSASSINATED(t)	((t)->tk_flags & RPC_TASK_KILLED)

#define RPC_IS_SOFT(t)		((t)->tk_flags & RPC_TASK_SOFT)

#define RPC_IS_SOFT(t)		((t)->tk_flags & (RPC_TASK_SOFT|RPC_TASK_TIMEOUT))

#define RPC_IS_SOFTCONN(t)	((t)->tk_flags & RPC_TASK_SOFTCONN)

#define RPC_WAS_SENT(t)		((t)->tk_flags & RPC_TASK_SENT)

net/sunrpc/clnt.c

+4 −1
Original line number Diff line number Diff line
@@ -1508,6 +1508,9 @@ call_timeout(struct rpc_task *task) 
		if (clnt->cl_chatty)

			printk(KERN_NOTICE "%s: server %s not responding, timed out\n",

				clnt->cl_protname, clnt->cl_server);

		if (task->tk_flags & RPC_TASK_TIMEOUT)

			rpc_exit(task, -ETIMEDOUT);

		else

			rpc_exit(task, -EIO);

		return;

	}