Fix NFS client state recovery
Subsystems (2)
cover Fix NFS client state recovery
- Fix up client to work with NFSv4/v4.1 all or nothing reboot recovery
- Fix open/state recovery error handling
Trond Myklebust (2):
NFSv4: Don't convert unreclaimed locks on STALE_CLIENTID
NFSv4: fix open/lock state recovery error handling
fs/nfs/nfs4state.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-)
Signature · 1 line
1.9.3
PATCH 1/2 NFSv4: Don't convert unreclaimed locks on STALE_CLIENTID
If the server tells us that it rebooted, then we should assume that we can reclaim all locks or none, and we should rely on the server returning NFS4ERR_NO_GRACE if we cannot reclaim all outstanding locks.
This patch removes those instances where we deliberately convert unreclaimed locks.
--- fs/nfs/nfs4state.c | 2 -- 1 file changed, 2 deletions(-)
fs/nfs/nfs4state.c +0 -2
@@ -1648,7 +1648,6 @@ static int nfs4_recovery_handle_error(struct nfs_client *clp, int error)break ;case -NFS4ERR_STALE_CLIENTID :set_bit (NFS4CLNT_LEASE_EXPIRED , &clp->cl_state); -nfs4_state_clear_reclaim_reboot (clp);nfs4_state_start_reclaim_reboot (clp);break ;case -NFS4ERR_EXPIRED :
@@ -1761,7 +1760,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 :
Signature · 1 line
1.9.3
PATCH 2/2 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.
--- fs/nfs/nfs4state.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
fs/nfs/nfs4state.c +6 -10
@@ -1704,7 +1704,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);
@@ -1713,7 +1714,7 @@ restart:spin_unlock (&clp->cl_lock); }rcu_read_unlock (); -return status; +return 0 ; }static int nfs4_check_lease (struct nfs_client *clp)
@@ -2364,14 +2365,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... */
@@ -2379,9 +2377,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;
Signature · 1 line
1.9.3