nfs: handle NFSv3 -EKEYEXPIRED errors as we would -EJUKEBOX (b68d69b8) · Commits · 戴 / test

We're using -EKEYEXPIRED to indicate that a krb5 credcache contains an expired ticket and that we should have the NFS layer retry the RPC call instead of returning an error back to the caller. Handle this as we would an -EJUKEBOX error return. Signed-off-by:

Jeff Layton <jlayton@redhat.com> Signed-off-by:

Trond Myklebust <Trond.Myklebust@netapp.com>

fs/nfs/nfs3proc.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -22,14 +22,14 @@

		#define NFSDBG_FACILITY NFSDBG_PROC

		/* A wrapper to handle the EJUKEBOX error message */
		/* A wrapper to handle the EJUKEBOX and EKEYEXPIRED error messages */
		static int
		nfs3_rpc_wrapper(struct rpc_clnt clnt, struct rpc_message msg, int flags)
		{
		int res;
		do {
		res = rpc_call_sync(clnt, msg, flags);
		if (res != -EJUKEBOX)
		if (res != -EJUKEBOX && res != -EKEYEXPIRED)
		break;
		schedule_timeout_killable(NFS_JUKEBOX_RETRY_TIME);
		res = -ERESTARTSYS;
		@@ -42,8 +42,9 @@ nfs3_rpc_wrapper(struct rpc_clnt clnt, struct rpc_message msg, int flags)
		static int
		nfs3_async_handle_jukebox(struct rpc_task task, struct inode inode)
		{
		if (task->tk_status != -EJUKEBOX)
		if (task->tk_status != -EJUKEBOX && task->tk_status != -EKEYEXPIRED)
		return 0;
		if (task->tk_status == -EJUKEBOX)
		nfs_inc_stats(inode, NFSIOS_DELAY);
		task->tk_status = 0;
		rpc_restart_call(task);

Admin message