Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6ca948238724c945bd353f51d54ae7d285f3889f

Authored by Chuck Lever
Committed by Trond Myklebust
1 parent c4efcb1d3e
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

Showing 3 changed files with 0 additions and 5 deletions Side-by-side Diff

... ... @@ -26,7 +26,6 @@
26 26 #define NLM_HOST_REBIND (60 * HZ)
27 27 #define NLM_HOST_EXPIRE ((nrhosts > NLM_HOST_MAX)? 300 * HZ : 120 * HZ)
28 28 #define NLM_HOST_COLLECT ((nrhosts > NLM_HOST_MAX)? 120 * HZ : 60 * HZ)
29   -#define NLM_HOST_ADDR(sv) (&(sv)->s_nlmclnt->cl_xprt->addr)
30 29  
31 30 static struct nlm_host * nlm_hosts[NLM_HOST_NRHASH];
32 31 static unsigned long next_gc;
include/linux/nfs_fs.h
Diff comments   View file @ 6ca9482
... ... @@ -216,7 +216,6 @@
216 216 #define NFS_SERVER(inode) (NFS_SB(inode->i_sb))
217 217 #define NFS_CLIENT(inode) (NFS_SERVER(inode)->client)
218 218 #define NFS_PROTO(inode) (NFS_SERVER(inode)->nfs_client->rpc_ops)
219   -#define NFS_ADDR(inode) (RPC_PEERADDR(NFS_CLIENT(inode)))
220 219 #define NFS_COOKIEVERF(inode) (NFS_I(inode)->cookieverf)
221 220 #define NFS_READTIME(inode) (NFS_I(inode)->read_cache_jiffies)
222 221 #define NFS_CHANGE_ATTR(inode) (NFS_I(inode)->change_attr)
include/linux/sunrpc/clnt.h
Diff comments   View file @ 6ca9482
... ... @@ -89,9 +89,6 @@
89 89 char * p_name; /* name of procedure */
90 90 };
91 91  
92   -#define RPC_CONGESTED(clnt) (RPCXPRT_CONGESTED((clnt)->cl_xprt))
93   -#define RPC_PEERADDR(clnt) (&(clnt)->cl_xprt->addr)
94   -
95 92 #ifdef __KERNEL__
96 93  
97 94 struct rpc_clnt *rpc_create_client(struct rpc_xprt *xprt, char *servname,