Merge branch 'bugfixes' into linux-next

* bugfixes:
  NFSv4.1: Fix an NFSv4.1 state renewal regression
  NFSv4: fix open/lock state recovery error handling
  NFSv4: Fix lock recovery when CREATE_SESSION/SETCLIENTID_CONFIRM fails
  NFS: Fabricate fscache server index key correctly
  SUNRPC: Add missing support for RPC_CLNT_CREATE_NO_RETRANS_TIMEOUT
  nfs: fix duplicate proc entries

1 files changed, 6 insertions, 11 deletions

diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 6678769e1a54..5194933ed419 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -1705,7 +1705,8 @@ restart:
                         if (status < 0) {
                                 set_bit(ops->owner_flag_bit, &sp->so_flags);
                                 nfs4_put_state_owner(sp);
-                                return nfs4_recovery_handle_error(clp, status);
+                                status = nfs4_recovery_handle_error(clp, status);
+                                return (status != 0) ? status : -EAGAIN;
                         }
 
                         nfs4_put_state_owner(sp);
@@ -1714,7 +1715,7 @@ restart:
                 spin_unlock(&clp->cl_lock);
         }
         rcu_read_unlock();
-        return status;
+        return 0;
 }
 
 static int nfs4_check_lease(struct nfs_client *clp)
@@ -1761,7 +1762,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:
@@ -2367,14 +2367,11 @@ static void nfs4_state_manager(struct nfs_client *clp)
                         section = "reclaim reboot";
                         status = nfs4_do_reclaim(clp,
                                 clp->cl_mvops->reboot_recovery_ops);
-                        if (test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state) ||
-                            test_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state))
-                                continue;
-                        nfs4_state_end_reclaim_reboot(clp);
-                        if (test_bit(NFS4CLNT_RECLAIM_NOGRACE, &clp->cl_state))
+                        if (status == -EAGAIN)
                                 continue;
                         if (status < 0)
                                 goto out_error;
+                        nfs4_state_end_reclaim_reboot(clp);
                 }
 
                 /* Now recover expired state... */
@@ -2382,9 +2379,7 @@ static void nfs4_state_manager(struct nfs_client *clp)
                         section = "reclaim nograce";
                         status = nfs4_do_reclaim(clp,
                                 clp->cl_mvops->nograce_recovery_ops);
-                        if (test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state) ||
-                            test_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state) ||
-                            test_bit(NFS4CLNT_RECLAIM_REBOOT, &clp->cl_state))
+                        if (status == -EAGAIN)
                                 continue;
                         if (status < 0)
                                 goto out_error;