diff options
Diffstat (limited to 'fs/nfs')
-rw-r--r-- | fs/nfs/nfs4state.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 3da8130d4460..24a3ab492df2 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c | |||
@@ -1680,8 +1680,8 @@ out: | |||
1680 | return nfs4_recovery_handle_error(clp, status); | 1680 | return nfs4_recovery_handle_error(clp, status); |
1681 | } | 1681 | } |
1682 | 1682 | ||
1683 | /* Set NFS4CLNT_LEASE_EXPIRED for all v4.0 errors and for recoverable errors | 1683 | /* Set NFS4CLNT_LEASE_EXPIRED and reclaim reboot state for all v4.0 errors |
1684 | * on EXCHANGE_ID for v4.1 | 1684 | * and for recoverable errors on EXCHANGE_ID for v4.1 |
1685 | */ | 1685 | */ |
1686 | static int nfs4_handle_reclaim_lease_error(struct nfs_client *clp, int status) | 1686 | static int nfs4_handle_reclaim_lease_error(struct nfs_client *clp, int status) |
1687 | { | 1687 | { |
@@ -1691,8 +1691,12 @@ static int nfs4_handle_reclaim_lease_error(struct nfs_client *clp, int status) | |||
1691 | return -ESERVERFAULT; | 1691 | return -ESERVERFAULT; |
1692 | /* Lease confirmation error: retry after purging the lease */ | 1692 | /* Lease confirmation error: retry after purging the lease */ |
1693 | ssleep(1); | 1693 | ssleep(1); |
1694 | clear_bit(NFS4CLNT_LEASE_CONFIRM, &clp->cl_state); | ||
1695 | break; | ||
1694 | case -NFS4ERR_STALE_CLIENTID: | 1696 | case -NFS4ERR_STALE_CLIENTID: |
1695 | clear_bit(NFS4CLNT_LEASE_CONFIRM, &clp->cl_state); | 1697 | clear_bit(NFS4CLNT_LEASE_CONFIRM, &clp->cl_state); |
1698 | nfs4_state_clear_reclaim_reboot(clp); | ||
1699 | nfs4_state_start_reclaim_reboot(clp); | ||
1696 | break; | 1700 | break; |
1697 | case -NFS4ERR_CLID_INUSE: | 1701 | case -NFS4ERR_CLID_INUSE: |
1698 | pr_err("NFS: Server %s reports our clientid is in use\n", | 1702 | pr_err("NFS: Server %s reports our clientid is in use\n", |