| From df817ba35736db2d62b07de6f050a4db53492ad8 Mon Sep 17 00:00:00 2001 |
| From: Trond Myklebust <trond.myklebust@primarydata.com> |
| Date: Sat, 27 Sep 2014 17:41:51 -0400 |
| Subject: NFSv4: fix open/lock state recovery error handling |
| |
| From: Trond Myklebust <trond.myklebust@primarydata.com> |
| |
| commit df817ba35736db2d62b07de6f050a4db53492ad8 upstream. |
| |
| The current open/lock state recovery unfortunately does not handle errors |
| such as NFS4ERR_CONN_NOT_BOUND_TO_SESSION correctly. Instead of looping, |
| just proceeds as if the state manager is finished recovering. |
| This patch ensures that we loop back, handle higher priority errors |
| and complete the open/lock state recovery. |
| |
| Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| fs/nfs/nfs4state.c | 16 ++++++---------- |
| 1 file changed, 6 insertions(+), 10 deletions(-) |
| |
| --- a/fs/nfs/nfs4state.c |
| +++ b/fs/nfs/nfs4state.c |
| @@ -1699,7 +1699,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); |
| @@ -1708,7 +1709,7 @@ restart: |
| spin_unlock(&clp->cl_lock); |
| } |
| rcu_read_unlock(); |
| - return status; |
| + return 0; |
| } |
| |
| static int nfs4_check_lease(struct nfs_client *clp) |
| @@ -2173,14 +2174,11 @@ static void nfs4_state_manager(struct nf |
| 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... */ |
| @@ -2188,9 +2186,7 @@ static void nfs4_state_manager(struct nf |
| 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; |