Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e345e88a authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Fix up the callers of nfs4_state_end_reclaim_reboot 



In practice, we need to ensure that we call nfs4_state_end_reclaim_reboot
in 2 cases:

 - If we lose the lease while we were reclaiming state
OR
 - After we're done with reboot recovery

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent d18cc1fd

fs/nfs/nfs4state.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -1060,6 +1060,7 @@ static void nfs4_recovery_handle_error(struct nfs_client *clp, int error) 
		case -NFS4ERR_STALE_CLIENTID:

		case -NFS4ERR_STALE_CLIENTID:

		case -NFS4ERR_LEASE_MOVED:

		case -NFS4ERR_LEASE_MOVED:

			set_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state);

			set_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state);

			nfs4_state_end_reclaim_reboot(clp);

			nfs4_state_start_reclaim_reboot(clp);

			nfs4_state_start_reclaim_reboot(clp);

			break;

			break;

		case -NFS4ERR_EXPIRED:

		case -NFS4ERR_EXPIRED:
@@ -1263,7 +1264,7 @@ static void nfs4_state_manager(struct nfs_client *clp) 
			}

			}

		}

		}

		/* First recover reboot state... */

		/* First recover reboot state... */

		if (test_and_clear_bit(NFS4CLNT_RECLAIM_REBOOT, &clp->cl_state)) {

		if (test_bit(NFS4CLNT_RECLAIM_REBOOT, &clp->cl_state)) {

			status = nfs4_do_reclaim(clp,

			status = nfs4_do_reclaim(clp,

				nfs4_reboot_recovery_ops[clp->cl_minorversion]);

				nfs4_reboot_recovery_ops[clp->cl_minorversion]);

			if (status == -NFS4ERR_STALE_CLIENTID)

			if (status == -NFS4ERR_STALE_CLIENTID)
@@ -1309,8 +1310,6 @@ static void nfs4_state_manager(struct nfs_client *clp) 
out_error:

out_error:

	printk(KERN_WARNING "Error: state manager failed on NFSv4 server %s"

	printk(KERN_WARNING "Error: state manager failed on NFSv4 server %s"

			" with error %d\n", clp->cl_hostname, -status);

			" with error %d\n", clp->cl_hostname, -status);

	if (test_bit(NFS4CLNT_RECLAIM_REBOOT, &clp->cl_state))

		nfs4_state_end_reclaim_reboot(clp);

	nfs4_clear_state_manager_bit(clp);

	nfs4_clear_state_manager_bit(clp);

}

}