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

Commit 6ca94823 authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

SUNRPC: Clean-up after previous patches. 



Remove some unused macros related to accessing an RPC peer address

Test plan:
Compile kernel with CONFIG_NFS option enabled.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent c4efcb1d

fs/lockd/host.c

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#define NLM_HOST_REBIND		(60 * HZ)

#define NLM_HOST_EXPIRE		((nrhosts > NLM_HOST_MAX)? 300 * HZ : 120 * HZ)

#define NLM_HOST_COLLECT	((nrhosts > NLM_HOST_MAX)? 120 * HZ :  60 * HZ)

#define NLM_HOST_ADDR(sv)	(&(sv)->s_nlmclnt->cl_xprt->addr)



static struct nlm_host *	nlm_hosts[NLM_HOST_NRHASH];

static unsigned long		next_gc;

include/linux/nfs_fs.h

+0 −1
Original line number Diff line number Diff line
@@ -216,7 +216,6 @@ static inline struct nfs_inode *NFS_I(struct inode *inode) 
#define NFS_SERVER(inode)		(NFS_SB(inode->i_sb))

#define NFS_CLIENT(inode)		(NFS_SERVER(inode)->client)

#define NFS_PROTO(inode)		(NFS_SERVER(inode)->nfs_client->rpc_ops)

#define NFS_ADDR(inode)			(RPC_PEERADDR(NFS_CLIENT(inode)))

#define NFS_COOKIEVERF(inode)		(NFS_I(inode)->cookieverf)

#define NFS_READTIME(inode)		(NFS_I(inode)->read_cache_jiffies)

#define NFS_CHANGE_ATTR(inode)		(NFS_I(inode)->change_attr)

include/linux/sunrpc/clnt.h

+0 −3
Original line number Diff line number Diff line
@@ -89,9 +89,6 @@ struct rpc_procinfo { 
	char *			p_name;		/* name of procedure */

};



#define RPC_CONGESTED(clnt)	(RPCXPRT_CONGESTED((clnt)->cl_xprt))

#define RPC_PEERADDR(clnt)	(&(clnt)->cl_xprt->addr)



#ifdef __KERNEL__



struct rpc_clnt *rpc_create_client(struct rpc_xprt *xprt, char *servname,