On 09/27/2014 11:54 PM, Trond Myklebust wrote:
> 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@xxxxxxxxxxxxxxx
> Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>
> ---
> fs/nfs/nfs4state.c | 16 ++++++----------
> 1 file changed, 6 insertions(+), 10 deletions(-)
>
> diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
> index 26d510d11efd..87b2d0e79797 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;
Why is the ternary better than doing something like this?
if (status == 0)
return -EAGAIN;
return status;
Anna
> }
>
> 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)
> @@ -2365,14 +2366,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... */
> @@ -2380,9 +2378,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;
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
