Commit 3f10a6af authored by Anna Schumaker's avatar Anna Schumaker Committed by Trond Myklebust
Browse files

NFS: Remove nfs41_server_notify_{target|highest}_slotid_update() 



All these functions do is call nfs41_ping_server() without adding
anything.  Let's remove them and give nfs41_ping_server() a better name
instead.

Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent fb2a525c

fs/nfs/callback_proc.c

+1 −1
Original line number Diff line number Diff line
@@ -554,7 +554,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);

	nfs41_notify_server(cps->clp);

out:

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

	return status;

fs/nfs/nfs4_fs.h

+1 −3
Original line number Diff line number Diff line
@@ -405,9 +405,7 @@ int nfs40_discover_server_trunking(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);

extern void nfs41_server_notify_highest_slotid_update(struct nfs_client *clp);



extern void nfs41_notify_server(struct nfs_client *);

#else

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

{

fs/nfs/nfs4proc.c

+1 −1
Original line number Diff line number Diff line
@@ -586,7 +586,7 @@ static void nfs41_sequence_free_slot(struct nfs4_sequence_res *res) 
	spin_unlock(&tbl->slot_tbl_lock);

	res->sr_slot = NULL;

	if (send_new_highest_used_slotid)

		nfs41_server_notify_highest_slotid_update(session->clp);

		nfs41_notify_server(session->clp);

}



int nfs41_sequence_done(struct rpc_task *task, struct nfs4_sequence_res *res)

fs/nfs/nfs4state.c

+1 −11
Original line number Diff line number Diff line
@@ -2152,23 +2152,13 @@ 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)

void nfs41_notify_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);

}



void nfs41_server_notify_highest_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) {