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

NFSv4.1: CB_RECALL_SLOT must schedule a sequence op after updating targets 



RFC5661 requires us to make sure that the server knows we've updated
our slot table size by sending at least one SEQUENCE op containing the
new 'highest_slotid' value.
We can do so using the 'CHECK_LEASE' functionality of the state
manager.

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

fs/nfs/callback_proc.c

+1 −0
Original line number Diff line number Diff line
@@ -570,6 +570,7 @@ __be32 nfs4_callback_recallslot(struct cb_recallslotargs *args, void *dummy, 
	status = htonl(NFS4_OK);



	nfs41_set_target_slotid(fc_tbl, args->crsa_target_highest_slotid);

	nfs41_server_notify_target_slotid_update(cps->clp);

out:

	dprintk("%s: exit with status = %d\n", __func__, ntohl(status));

	return status;

fs/nfs/nfs4_fs.h

+1 −0
Original line number Diff line number Diff line
@@ -334,6 +334,7 @@ struct rpc_cred *nfs4_get_exchange_id_cred(struct nfs_client *clp); 
int nfs41_discover_server_trunking(struct nfs_client *clp,

			struct nfs_client **, struct rpc_cred *);

extern void nfs4_schedule_session_recovery(struct nfs4_session *, int);

extern void nfs41_server_notify_target_slotid_update(struct nfs_client *clp);

#else

static inline void nfs4_schedule_session_recovery(struct nfs4_session *session, int err)

{

fs/nfs/nfs4state.c

+12 −0
Original line number Diff line number Diff line
@@ -1904,6 +1904,18 @@ void nfs4_schedule_session_recovery(struct nfs4_session *session, int err) 
}

EXPORT_SYMBOL_GPL(nfs4_schedule_session_recovery);



static void nfs41_ping_server(struct nfs_client *clp)

{

	/* Use CHECK_LEASE to ping the server with a SEQUENCE */

	set_bit(NFS4CLNT_CHECK_LEASE, &clp->cl_state);

	nfs4_schedule_state_manager(clp);

}



void nfs41_server_notify_target_slotid_update(struct nfs_client *clp)

{

	nfs41_ping_server(clp);

}



static void nfs4_reset_all_state(struct nfs_client *clp)

{

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