aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/lockd
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2008-09-03 14:35:46 -0400
committerJ. Bruce Fields <bfields@citi.umich.edu>2008-09-29 18:13:39 -0400
commit90151e6e4d00a3150d03d52170c246734b274622 (patch)
treebb0c7b1ab2b08ca86e87a30e0da0779a14a9b94d /include/linux/lockd
parentb4ed58fd34d4def88bda59f9cc566ec9fca6a096 (diff)
lockd: Use sockaddr_storage for h_saddr field
To store larger addresses in the nlm_host structure, make h_saddr a sockaddr_storage. And let's call it something more self-explanatory: "saddr" could easily be mistaken for "server address". Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'include/linux/lockd')
-rw-r--r--include/linux/lockd/lockd.h14
1 files changed, 12 insertions, 2 deletions
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index 41d7a8e61cea..964e6c93830f 100644
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -40,7 +40,7 @@ struct nlm_host {
40 struct hlist_node h_hash; /* doubly linked list */ 40 struct hlist_node h_hash; /* doubly linked list */
41 struct sockaddr_storage h_addr; /* peer address */ 41 struct sockaddr_storage h_addr; /* peer address */
42 size_t h_addrlen; 42 size_t h_addrlen;
43 struct sockaddr_in h_saddr; /* our address (optional) */ 43 struct sockaddr_storage h_srcaddr; /* our address (optional) */
44 struct rpc_clnt * h_rpcclnt; /* RPC client to talk to peer */ 44 struct rpc_clnt * h_rpcclnt; /* RPC client to talk to peer */
45 char * h_name; /* remote hostname */ 45 char * h_name; /* remote hostname */
46 u32 h_version; /* interface version */ 46 u32 h_version; /* interface version */
@@ -64,7 +64,7 @@ struct nlm_host {
64 struct nsm_handle * h_nsmhandle; /* NSM status handle */ 64 struct nsm_handle * h_nsmhandle; /* NSM status handle */
65 65
66 char h_addrbuf[48], /* address eyecatchers */ 66 char h_addrbuf[48], /* address eyecatchers */
67 h_saddrbuf[48]; 67 h_srcaddrbuf[48];
68}; 68};
69 69
70struct nsm_handle { 70struct nsm_handle {
@@ -90,6 +90,16 @@ static inline struct sockaddr *nlm_addr(const struct nlm_host *host)
90 return (struct sockaddr *)&host->h_addr; 90 return (struct sockaddr *)&host->h_addr;
91} 91}
92 92
93static inline struct sockaddr_in *nlm_srcaddr_in(const struct nlm_host *host)
94{
95 return (struct sockaddr_in *)&host->h_srcaddr;
96}
97
98static inline struct sockaddr *nlm_srcaddr(const struct nlm_host *host)
99{
100 return (struct sockaddr *)&host->h_srcaddr;
101}
102
93/* 103/*
94 * Map an fl_owner_t into a unique 32-bit "pid" 104 * Map an fl_owner_t into a unique 32-bit "pid"
95 */ 105 */