Commit 707fb4b3 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Clean up NFS4ERR_CB_PATH_DOWN error management... 



Add a delegation cleanup phase to the state management loop, and do the
NFS4ERR_CB_PATH_DOWN recovery there.

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

fs/nfs/delegation.c

+8 −6
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ static int __nfs_inode_return_delegation(struct inode *inode, struct nfs_delegat 
/*

 * Return all delegations that have been marked for return

 */

static void nfs_client_return_marked_delegations(struct nfs_client *clp)

void nfs_client_return_marked_delegations(struct nfs_client *clp)

{

	struct nfs_delegation *delegation;

	struct inode *inode;
@@ -342,15 +342,16 @@ void nfs_super_return_all_delegations(struct super_block *sb) 
	nfs_client_return_marked_delegations(clp);

}



static void nfs_client_return_all_delegations(struct nfs_client *clp)

static void nfs_client_mark_return_all_delegations(struct nfs_client *clp)

{

	struct nfs_delegation *delegation;



	rcu_read_lock();

	list_for_each_entry_rcu(delegation, &clp->cl_delegations, super_list)

	list_for_each_entry_rcu(delegation, &clp->cl_delegations, super_list) {

		set_bit(NFS_DELEGATION_RETURN, &delegation->flags);

		set_bit(NFS4CLNT_DELEGRETURN, &clp->cl_state);

	}

	rcu_read_unlock();

	nfs_client_return_marked_delegations(clp);

}



static int nfs_do_expire_all_delegations(void *ptr)
@@ -363,7 +364,8 @@ static int nfs_do_expire_all_delegations(void *ptr) 
		goto out;

	if (test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state) == 0)

		goto out;

	nfs_client_return_all_delegations(clp);

	nfs_client_mark_return_all_delegations(clp);

	nfs_client_return_marked_delegations(clp);

out:

	nfs_put_client(clp);

	module_put_and_exit(0);
@@ -392,7 +394,7 @@ void nfs_handle_cb_pathdown(struct nfs_client *clp) 
{

	if (clp == NULL)

		return;

	nfs_client_return_all_delegations(clp);

	nfs_client_mark_return_all_delegations(clp);

}



struct recall_threadargs {

fs/nfs/delegation.h

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ struct inode *nfs_delegation_find_inode(struct nfs_client *clp, const struct nfs 
void nfs_super_return_all_delegations(struct super_block *sb);

void nfs_expire_all_delegations(struct nfs_client *clp);

void nfs_handle_cb_pathdown(struct nfs_client *clp);

void nfs_client_return_marked_delegations(struct nfs_client *clp);



void nfs_delegation_mark_reclaim(struct nfs_client *clp);

void nfs_delegation_reap_unclaimed(struct nfs_client *clp);

fs/nfs/nfs4_fs.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ enum nfs4_client_state { 
	NFS4CLNT_LEASE_EXPIRED,

	NFS4CLNT_RECLAIM_REBOOT,

	NFS4CLNT_RECLAIM_NOGRACE,

	NFS4CLNT_CB_PATH_DOWN,

	NFS4CLNT_DELEGRETURN,

};



/*

fs/nfs/nfs4state.c

+6 −3
Original line number Diff line number Diff line
@@ -1027,7 +1027,7 @@ static void nfs4_recovery_handle_error(struct nfs_client *clp, int error) 
{

	switch (error) {

		case -NFS4ERR_CB_PATH_DOWN:

			set_bit(NFS4CLNT_CB_PATH_DOWN, &clp->cl_state);

			nfs_handle_cb_pathdown(clp);

			break;

		case -NFS4ERR_STALE_CLIENTID:

		case -NFS4ERR_LEASE_MOVED:
@@ -1156,11 +1156,14 @@ static int reclaimer(void *ptr) 
				nfs4_state_end_reclaim_nograce(clp);

			continue;

		}



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

			nfs_client_return_marked_delegations(clp);

			continue;

		}

		break;

	}

out:

	if (test_and_clear_bit(NFS4CLNT_CB_PATH_DOWN, &clp->cl_state))

		nfs_handle_cb_pathdown(clp);

	nfs4_clear_recover_bit(clp);

	nfs_put_client(clp);

	module_put_and_exit(0);