Commit 47b803c8 authored by Andy Adamson's avatar Andy Adamson Committed by Trond Myklebust
Browse files

NFSv4.0 reclaim reboot state when re-establishing clientid 



We should reclaim reboot state when the clientid is stale.

Signed-off-by: default avatarAndy Adamson <andros@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent f9d640f3

fs/nfs/nfs4state.c

+6 −2
Original line number Diff line number Diff line
@@ -1680,8 +1680,8 @@ static int nfs4_check_lease(struct nfs_client *clp) 
	return nfs4_recovery_handle_error(clp, status);

}



/* Set NFS4CLNT_LEASE_EXPIRED for all v4.0 errors and for recoverable errors

 * on EXCHANGE_ID for v4.1

/* Set NFS4CLNT_LEASE_EXPIRED and reclaim reboot state for all v4.0 errors

 * and for recoverable errors on EXCHANGE_ID for v4.1

 */

static int nfs4_handle_reclaim_lease_error(struct nfs_client *clp, int status)

{
@@ -1691,8 +1691,12 @@ static int nfs4_handle_reclaim_lease_error(struct nfs_client *clp, int status) 
			return -ESERVERFAULT;

		/* Lease confirmation error: retry after purging the lease */

		ssleep(1);

		clear_bit(NFS4CLNT_LEASE_CONFIRM, &clp->cl_state);

		break;

	case -NFS4ERR_STALE_CLIENTID:

		clear_bit(NFS4CLNT_LEASE_CONFIRM, &clp->cl_state);

		nfs4_state_clear_reclaim_reboot(clp);

		nfs4_state_start_reclaim_reboot(clp);

		break;

	case -NFS4ERR_CLID_INUSE:

		pr_err("NFS: Server %s reports our clientid is in use\n",