summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2014-09-27 17:02:26 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-10-30 09:38:22 -0700
commit7c4ed3855612cf818b65649984ef1ba7b7cbab39 (patch)
treede658e2d43bb97e4b48d635d61bfcfca10377832
parent29c736dccf67f3c1f9ff88440fbf2d89b782c41f (diff)
downloadlinux-stable-7c4ed3855612cf818b65649984ef1ba7b7cbab39.tar.gz
linux-stable-7c4ed3855612cf818b65649984ef1ba7b7cbab39.tar.bz2
linux-stable-7c4ed3855612cf818b65649984ef1ba7b7cbab39.zip
NFSv4: Fix lock recovery when CREATE_SESSION/SETCLIENTID_CONFIRM fails
commit a4339b7b686b4acc8b6de2b07d7bacbe3ae44b83 upstream. If a NFSv4.x server returns NFS4ERR_STALE_CLIENTID in response to a CREATE_SESSION or SETCLIENTID_CONFIRM in order to tell us that it rebooted a second time, then the client will currently take this to mean that it must declare all locks to be stale, and hence ineligible for reboot recovery. RFC3530 and RFC5661 both suggest that the client should instead rely on the server to respond to inelegible open share, lock and delegation reclaim requests with NFS4ERR_NO_GRACE in this situation. Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 c5bf96d7f70d..b129b683fe86 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -1788,7 +1788,6 @@ static int nfs4_handle_reclaim_lease_error(struct nfs_client *clp, int status)
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: