This is a note to let you know that I've just added the patch titled NFSv4: Fix lock recovery when CREATE_SESSION/SETCLIENTID_CONFIRM fails to the 3.16-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: nfsv4-fix-lock-recovery-when-create_session-setclientid_confirm-fails.patch and it can be found in the queue-3.16 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From a4339b7b686b4acc8b6de2b07d7bacbe3ae44b83 Mon Sep 17 00:00:00 2001 From: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx> Date: Sat, 27 Sep 2014 17:02:26 -0400 Subject: NFSv4: Fix lock recovery when CREATE_SESSION/SETCLIENTID_CONFIRM fails From: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- fs/nfs/nfs4state.c | 1 - 1 file changed, 1 deletion(-) --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -1788,7 +1788,6 @@ static int nfs4_handle_reclaim_lease_err 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: Patches currently in stable-queue which might be from trond.myklebust@xxxxxxxxxxxxxxx are queue-3.16/nfs-fix-an-uninitialised-pointer-oops-in-the-writeback-error-path.patch queue-3.16/fixing-lease-renewal.patch queue-3.16/nfsv4-fix-lock-recovery-when-create_session-setclientid_confirm-fails.patch queue-3.16/nfsv4.1-fix-an-nfsv4.1-state-renewal-regression.patch queue-3.16/nfs-fix-a-bogus-warning-in-nfs_generic_pgio.patch queue-3.16/nfsv4-fix-open-lock-state-recovery-error-handling.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html