Commit df817ba3 authored by Trond Myklebust's avatar Trond Myklebust

NFSv4: fix open/lock state recovery error handling

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.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent a4339b7b
...@@ -1705,7 +1705,8 @@ static int nfs4_do_reclaim(struct nfs_client *clp, const struct nfs4_state_recov ...@@ -1705,7 +1705,8 @@ static int nfs4_do_reclaim(struct nfs_client *clp, const struct nfs4_state_recov
if (status < 0) { if (status < 0) {
set_bit(ops->owner_flag_bit, &sp->so_flags); set_bit(ops->owner_flag_bit, &sp->so_flags);
nfs4_put_state_owner(sp); 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); nfs4_put_state_owner(sp);
...@@ -1714,7 +1715,7 @@ static int nfs4_do_reclaim(struct nfs_client *clp, const struct nfs4_state_recov ...@@ -1714,7 +1715,7 @@ static int nfs4_do_reclaim(struct nfs_client *clp, const struct nfs4_state_recov
spin_unlock(&clp->cl_lock); spin_unlock(&clp->cl_lock);
} }
rcu_read_unlock(); rcu_read_unlock();
return status; return 0;
} }
static int nfs4_check_lease(struct nfs_client *clp) static int nfs4_check_lease(struct nfs_client *clp)
...@@ -2365,14 +2366,11 @@ static void nfs4_state_manager(struct nfs_client *clp) ...@@ -2365,14 +2366,11 @@ static void nfs4_state_manager(struct nfs_client *clp)
section = "reclaim reboot"; section = "reclaim reboot";
status = nfs4_do_reclaim(clp, status = nfs4_do_reclaim(clp,
clp->cl_mvops->reboot_recovery_ops); clp->cl_mvops->reboot_recovery_ops);
if (test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state) || if (status == -EAGAIN)
test_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state))
continue;
nfs4_state_end_reclaim_reboot(clp);
if (test_bit(NFS4CLNT_RECLAIM_NOGRACE, &clp->cl_state))
continue; continue;
if (status < 0) if (status < 0)
goto out_error; goto out_error;
nfs4_state_end_reclaim_reboot(clp);
} }
/* Now recover expired state... */ /* Now recover expired state... */
...@@ -2380,9 +2378,7 @@ static void nfs4_state_manager(struct nfs_client *clp) ...@@ -2380,9 +2378,7 @@ static void nfs4_state_manager(struct nfs_client *clp)
section = "reclaim nograce"; section = "reclaim nograce";
status = nfs4_do_reclaim(clp, status = nfs4_do_reclaim(clp,
clp->cl_mvops->nograce_recovery_ops); clp->cl_mvops->nograce_recovery_ops);
if (test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state) || if (status == -EAGAIN)
test_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state) ||
test_bit(NFS4CLNT_RECLAIM_REBOOT, &clp->cl_state))
continue; continue;
if (status < 0) if (status < 0)
goto out_error; goto out_error;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment