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

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

NFSv4.0: Re-establish the callback channel on NFS4ERR_CB_PATHDOWN 



When the NFSv4.0 server tells us that it can no-longer talk to us
on the callback channel, we should attempt a new SETCLIENTID in
order to re-transmit the callback channel information.

Note that as long as we do not change the boot verifier, this is
a safe procedure; the server is required to keep our state.

Also move the function nfs_handle_cb_pathdown to fs/nfs/nfs4state.c,
and change the name in order to mark it as being specific to NFSv4.0.

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

fs/nfs/delegation.c

+0 −17
Original line number Diff line number Diff line
@@ -453,11 +453,6 @@ static void nfs_client_mark_return_all_delegation_types(struct nfs_client *clp, 
	rcu_read_unlock();

}



static void nfs_client_mark_return_all_delegations(struct nfs_client *clp)

{

	nfs_client_mark_return_all_delegation_types(clp, FMODE_READ|FMODE_WRITE);

}



static void nfs_delegation_run_state_manager(struct nfs_client *clp)

{

	if (test_bit(NFS4CLNT_DELEGRETURN, &clp->cl_state))
@@ -498,18 +493,6 @@ void nfs_expire_all_delegations(struct nfs_client *clp) 
	nfs_expire_all_delegation_types(clp, FMODE_READ|FMODE_WRITE);

}



/**

 * nfs_handle_cb_pathdown - return all delegations after NFS4ERR_CB_PATH_DOWN

 * @clp: client to process

 *

 */

void nfs_handle_cb_pathdown(struct nfs_client *clp)

{

	if (clp == NULL)

		return;

	nfs_client_mark_return_all_delegations(clp);

}



static void nfs_mark_return_unreferenced_delegations(struct nfs_server *server)

{

	struct nfs_delegation *delegation;

fs/nfs/delegation.h

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ void nfs_super_return_all_delegations(struct super_block *sb); 
void nfs_expire_all_delegations(struct nfs_client *clp);

void nfs_expire_all_delegation_types(struct nfs_client *clp, fmode_t flags);

void nfs_expire_unreferenced_delegations(struct nfs_client *clp);

void nfs_handle_cb_pathdown(struct nfs_client *clp);

int nfs_client_return_marked_delegations(struct nfs_client *clp);

int nfs_delegations_present(struct nfs_client *clp);

void nfs_remove_bad_delegation(struct inode *inode);

fs/nfs/nfs4state.c

+16 −2
Original line number Diff line number Diff line
@@ -1097,9 +1097,23 @@ void nfs4_schedule_lease_recovery(struct nfs_client *clp) 
}

EXPORT_SYMBOL_GPL(nfs4_schedule_lease_recovery);



/*

 * nfs40_handle_cb_pathdown - return all delegations after NFS4ERR_CB_PATH_DOWN

 * @clp: client to process

 *

 * Set the NFS4CLNT_LEASE_EXPIRED state in order to force a

 * resend of the SETCLIENTID and hence re-establish the

 * callback channel. Then return all existing delegations.

 */

static void nfs40_handle_cb_pathdown(struct nfs_client *clp)

{

	set_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state);

	nfs_expire_all_delegations(clp);

}



void nfs4_schedule_path_down_recovery(struct nfs_client *clp)

{

	nfs_handle_cb_pathdown(clp);

	nfs40_handle_cb_pathdown(clp);

	nfs4_schedule_state_manager(clp);

}
@@ -1444,7 +1458,7 @@ static int nfs4_recovery_handle_error(struct nfs_client *clp, int error) 
		case 0:

			break;

		case -NFS4ERR_CB_PATH_DOWN:

			nfs_handle_cb_pathdown(clp);

			nfs40_handle_cb_pathdown(clp);

			break;

		case -NFS4ERR_NO_GRACE:

			nfs4_state_end_reclaim_reboot(clp);