summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlga Kornievskaia <kolga@netapp.com>2014-09-24 18:11:28 -0400
committerTrond Myklebust <trond.myklebust@primarydata.com>2014-09-24 23:03:15 -0400
commit8faaa6d5d48b201527e0451296d9e71d23afb362 (patch)
treee03e448aabe0d50270be2afb73c12b8bb15bf6e7
parent5466112f0935f079e225514905c57d5e5285a9b6 (diff)
downloadop-kernel-dev-8faaa6d5d48b201527e0451296d9e71d23afb362.zip
op-kernel-dev-8faaa6d5d48b201527e0451296d9e71d23afb362.tar.gz
Fixing lease renewal
Commit c9fdeb28 removed a 'continue' after checking if the lease needs to be renewed. However, if client hasn't moved, the code falls down to starting reboot recovery erroneously (ie., sends open reclaim and gets back stale_clientid error) before recovering from getting stale_clientid on the renew operation. Signed-off-by: Olga Kornievskaia <kolga@netapp.com> Fixes: c9fdeb280b8c (NFS: Add basic migration support to state manager thread) Cc: stable@vger.kernel.org # 3.13+ Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
-rw-r--r--fs/nfs/nfs4state.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 22fe351..6678769 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -2345,6 +2345,7 @@ static void nfs4_state_manager(struct nfs_client *clp)
status = nfs4_check_lease(clp);
if (status < 0)
goto out_error;
+ continue;
}
if (test_and_clear_bit(NFS4CLNT_MOVED, &clp->cl_state)) {
OpenPOWER on IntegriCloud