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

Commit a5054873 authored by Trond Myklebust's avatar Trond Myklebust Committed by Greg Kroah-Hartman
Browse files

NFSv4.1: RECLAIM_COMPLETE must handle NFS4ERR_CONN_NOT_BOUND_TO_SESSION 




[ Upstream commit 0048fdd06614a4ea088f9fcad11511956b795698 ]

If the server returns NFS4ERR_CONN_NOT_BOUND_TO_SESSION because we
are trunking, then RECLAIM_COMPLETE must handle that by calling
nfs4_schedule_session_recovery() and then retrying.

Reported-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Tested-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fb625ba7

fs/nfs/nfs4proc.c

+6 −1
Original line number Diff line number Diff line
@@ -7429,6 +7429,12 @@ static int nfs41_reclaim_complete_handle_errors(struct rpc_task *task, struct nf 
		/* fall through */

	case -NFS4ERR_RETRY_UNCACHED_REP:

		return -EAGAIN;

	case -NFS4ERR_BADSESSION:

	case -NFS4ERR_DEADSESSION:

	case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION:

		nfs4_schedule_session_recovery(clp->cl_session,

				task->tk_status);

		break;

	default:

		nfs4_schedule_lease_recovery(clp);

	}
@@ -7507,7 +7513,6 @@ static int nfs41_proc_reclaim_complete(struct nfs_client *clp, 
	if (status == 0)

		status = task->tk_status;

	rpc_put_task(task);

	return 0;

out:

	dprintk("<-- %s status=%d\n", __func__, status);

	return status;

fs/nfs/nfs4state.c

+7 −3
Original line number Diff line number Diff line
@@ -1563,13 +1563,14 @@ static void nfs4_state_start_reclaim_reboot(struct nfs_client *clp) 
	nfs4_state_mark_reclaim_helper(clp, nfs4_state_mark_reclaim_reboot);

}



static void nfs4_reclaim_complete(struct nfs_client *clp,

static int nfs4_reclaim_complete(struct nfs_client *clp,

				 const struct nfs4_state_recovery_ops *ops,

				 struct rpc_cred *cred)

{

	/* Notify the server we're done reclaiming our state */

	if (ops->reclaim_complete)

		(void)ops->reclaim_complete(clp, cred);

		return ops->reclaim_complete(clp, cred);

	return 0;

}



static void nfs4_clear_reclaim_server(struct nfs_server *server)
@@ -1616,13 +1617,16 @@ static void nfs4_state_end_reclaim_reboot(struct nfs_client *clp) 
{

	const struct nfs4_state_recovery_ops *ops;

	struct rpc_cred *cred;

	int err;



	if (!nfs4_state_clear_reclaim_reboot(clp))

		return;

	ops = clp->cl_mvops->reboot_recovery_ops;

	cred = nfs4_get_clid_cred(clp);

	nfs4_reclaim_complete(clp, ops, cred);

	err = nfs4_reclaim_complete(clp, ops, cred);

	put_rpccred(cred);

	if (err == -NFS4ERR_CONN_NOT_BOUND_TO_SESSION)

		set_bit(NFS4CLNT_RECLAIM_REBOOT, &clp->cl_state);

}



static void nfs_delegation_clear_all(struct nfs_client *clp)