diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2008-09-03 14:35:39 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2008-09-29 18:13:39 -0400 |
| commit | b4ed58fd34d4def88bda59f9cc566ec9fca6a096 (patch) | |
| tree | ce377f9ec8773a26e4a967e7d73d42e99d39b0ea /include/linux/lockd | |
| parent | 5344b12d4f97d4a9a62d806425977a6ff64b6baf (diff) | |
| download | kernel_samsung_smdk4412-b4ed58fd34d4def88bda59f9cc566ec9fca6a096.zip kernel_samsung_smdk4412-b4ed58fd34d4def88bda59f9cc566ec9fca6a096.tar.gz kernel_samsung_smdk4412-b4ed58fd34d4def88bda59f9cc566ec9fca6a096.tar.bz2 | |
lockd: Use sockaddr_storage + length for h_addr field
To store larger addresses in the nlm_host structure, make h_addr a
sockaddr_storage, and add an address length field.
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.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h index 0691efb..41d7a8e 100644 --- a/include/linux/lockd/lockd.h +++ b/include/linux/lockd/lockd.h @@ -38,7 +38,8 @@ */ struct nlm_host { struct hlist_node h_hash; /* doubly linked list */ - struct sockaddr_in h_addr; /* peer address */ + struct sockaddr_storage h_addr; /* peer address */ + size_t h_addrlen; struct sockaddr_in h_saddr; /* our address (optional) */ struct rpc_clnt * h_rpcclnt; /* RPC client to talk to peer */ char * h_name; /* remote hostname */ @@ -77,6 +78,19 @@ struct nsm_handle { }; /* + * Rigorous type checking on sockaddr type conversions + */ +static inline struct sockaddr_in *nlm_addr_in(const struct nlm_host *host) +{ + return (struct sockaddr_in *)&host->h_addr; +} + +static inline struct sockaddr *nlm_addr(const struct nlm_host *host) +{ + return (struct sockaddr *)&host->h_addr; +} + +/* * Map an fl_owner_t into a unique 32-bit "pid" */ struct nlm_lockowner { |