From: Trond Myklebust Date: Fri, 13 Jan 2017 18:31:32 +0000 (-0500) Subject: NFSv4: Fix client recovery when server reboots multiple times X-Git-Tag: MMI-PSA29.97-13-9~6377^2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c6180a6237174f481dc856ed6e890d8196b6f0fb;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git NFSv4: Fix client recovery when server reboots multiple times 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 --- diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 1d152f4470cd..90e6193ce6be 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -1729,7 +1729,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: