Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

authored by

Anna Schumaker and committed by
Trond Myklebust
3f10a6af fb2a525c

+4 -16
+1 -1
fs/nfs/callback_proc.c
··· 554 554 status = htonl(NFS4_OK); 555 555 556 556 nfs41_set_target_slotid(fc_tbl, args->crsa_target_highest_slotid); 557 - nfs41_server_notify_target_slotid_update(cps->clp); 557 + nfs41_notify_server(cps->clp); 558 558 out: 559 559 dprintk("%s: exit with status = %d\n", __func__, ntohl(status)); 560 560 return status;
+1 -3
fs/nfs/nfs4_fs.h
··· 405 405 int nfs41_discover_server_trunking(struct nfs_client *clp, 406 406 struct nfs_client **, struct rpc_cred *); 407 407 extern void nfs4_schedule_session_recovery(struct nfs4_session *, int); 408 - extern void nfs41_server_notify_target_slotid_update(struct nfs_client *clp); 409 - extern void nfs41_server_notify_highest_slotid_update(struct nfs_client *clp); 410 - 408 + extern void nfs41_notify_server(struct nfs_client *); 411 409 #else 412 410 static inline void nfs4_schedule_session_recovery(struct nfs4_session *session, int err) 413 411 {
+1 -1
fs/nfs/nfs4proc.c
··· 586 586 spin_unlock(&tbl->slot_tbl_lock); 587 587 res->sr_slot = NULL; 588 588 if (send_new_highest_used_slotid) 589 - nfs41_server_notify_highest_slotid_update(session->clp); 589 + nfs41_notify_server(session->clp); 590 590 } 591 591 592 592 int nfs41_sequence_done(struct rpc_task *task, struct nfs4_sequence_res *res)
+1 -11
fs/nfs/nfs4state.c
··· 2152 2152 } 2153 2153 EXPORT_SYMBOL_GPL(nfs4_schedule_session_recovery); 2154 2154 2155 - static void nfs41_ping_server(struct nfs_client *clp) 2155 + void nfs41_notify_server(struct nfs_client *clp) 2156 2156 { 2157 2157 /* Use CHECK_LEASE to ping the server with a SEQUENCE */ 2158 2158 set_bit(NFS4CLNT_CHECK_LEASE, &clp->cl_state); 2159 2159 nfs4_schedule_state_manager(clp); 2160 - } 2161 - 2162 - void nfs41_server_notify_target_slotid_update(struct nfs_client *clp) 2163 - { 2164 - nfs41_ping_server(clp); 2165 - } 2166 - 2167 - void nfs41_server_notify_highest_slotid_update(struct nfs_client *clp) 2168 - { 2169 - nfs41_ping_server(clp); 2170 2160 } 2171 2161 2172 2162 static void nfs4_reset_all_state(struct nfs_client *clp)