summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2017-01-13 13:31:32 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-12-09 18:29:47 +0100
commit741a5969398f43203bf09768d9b7983eeeee0d29 (patch)
tree563cd0c4af65a22018372f976fa6c8caee5a99b4 /fs
parent351f504358fc4c7b44f6540949d6b71d89af2d0b (diff)
downloadlinux-stable-741a5969398f43203bf09768d9b7983eeeee0d29.tar.gz
linux-stable-741a5969398f43203bf09768d9b7983eeeee0d29.tar.bz2
linux-stable-741a5969398f43203bf09768d9b7983eeeee0d29.zip
NFSv4: Fix client recovery when server reboots multiple times
[ Upstream commit c6180a6237174f481dc856ed6e890d8196b6f0fb ] If the server reboots multiple times, the client should rely on the server to tell it that it cannot reclaim state as per section 9.6.3.4 in RFC7530 and section 8.4.2.1 in RFC5661. Currently, the client is being to conservative, and is assuming that if the server reboots while state recovery is in progress, then it must ignore state that was not recovered before the reboot. Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/nfs4state.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 1f9d57ab8df4..f471662c0a1f 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -1650,7 +1650,6 @@ static int nfs4_recovery_handle_error(struct nfs_client *clp, int error)
break;
case -NFS4ERR_STALE_CLIENTID:
set_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state);
- nfs4_state_clear_reclaim_reboot(clp);
nfs4_state_start_reclaim_reboot(clp);
break;
case -NFS4ERR_EXPIRED: