Merge branch 'master' into next

1 files changed, 3 insertions, 6 deletions

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index a4d242680299..4674f8092da8 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2594,12 +2594,9 @@ static void nfs4_renew_done(struct rpc_task *task, void *data)
         unsigned long timestamp = (unsigned long)data;
 
         if (task->tk_status < 0) {
-                switch (task->tk_status) {
-                        case -NFS4ERR_STALE_CLIENTID:
-                        case -NFS4ERR_EXPIRED:
-                        case -NFS4ERR_CB_PATH_DOWN:
-                                nfs4_schedule_state_recovery(clp);
-                }
+                /* Unless we're shutting down, schedule state recovery! */
+                if (test_bit(NFS_CS_RENEWD, &clp->cl_res_state) != 0)
+                        nfs4_schedule_state_recovery(clp);
                 return;
         }
         spin_lock(&clp->cl_lock);