2008-06-30 22:59:33

by Chuck Lever III

[permalink] [raw]
Subject: [PATCH 07/16] 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 <[email protected]>
---

fs/lockd/host.c | 12 ++++++------
fs/lockd/svcsubs.c | 2 +-
include/linux/lockd/lockd.h | 14 ++++++++++++--
3 files changed, 19 insertions(+), 9 deletions(-)


diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index e2f6212..290358b 100644
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -127,7 +127,7 @@ static struct nlm_host *nlm_lookup_host(int server,
continue;
if (host->h_server != server)
continue;
- if (!nlm_cmp_addr(&host->h_saddr, ssin))
+ if (!nlm_cmp_addr(nlm_srcaddr_in(host), ssin))
continue;

/* Move to head of hash chain. */
@@ -166,7 +166,7 @@ static struct nlm_host *nlm_lookup_host(int server,
memcpy(nlm_addr(host), sin, sizeof(*sin));
host->h_addrlen = sizeof(*sin);
nlm_clear_port(nlm_addr(host));
- host->h_saddr = *ssin;
+ memcpy(nlm_srcaddr(host), ssin, sizeof(*ssin));
host->h_version = version;
host->h_proto = proto;
host->h_rpcclnt = NULL;
@@ -190,8 +190,8 @@ static struct nlm_host *nlm_lookup_host(int server,

nlm_display_address((struct sockaddr *)&host->h_addr,
host->h_addrbuf, sizeof(host->h_addrbuf));
- nlm_display_address((struct sockaddr *)&host->h_saddr,
- host->h_saddrbuf, sizeof(host->h_saddrbuf));
+ nlm_display_address((struct sockaddr *)&host->h_srcaddr,
+ host->h_srcaddrbuf, sizeof(host->h_srcaddrbuf));

dprintk("lockd: nlm_lookup_host created host %s\n",
host->h_name);
@@ -265,7 +265,7 @@ nlm_bind_host(struct nlm_host *host)
struct rpc_clnt *clnt;

dprintk("lockd: nlm_bind_host %s (%s), my addr=%s\n",
- host->h_name, host->h_addrbuf, host->h_saddrbuf);
+ host->h_name, host->h_addrbuf, host->h_srcaddrbuf);

/* Lock host handle */
mutex_lock(&host->h_mutex);
@@ -292,7 +292,7 @@ nlm_bind_host(struct nlm_host *host)
.protocol = host->h_proto,
.address = nlm_addr(host),
.addrsize = host->h_addrlen,
- .saddress = (struct sockaddr *)&host->h_saddr,
+ .saddress = nlm_srcaddr(host),
.timeout = &timeparms,
.servername = host->h_name,
.program = &nlm_program,
diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c
index 723b6d5..64ba7df 100644
--- a/fs/lockd/svcsubs.c
+++ b/fs/lockd/svcsubs.c
@@ -415,7 +415,7 @@ EXPORT_SYMBOL_GPL(nlmsvc_unlock_all_by_sb);
static int
nlmsvc_match_ip(void *datap, struct nlm_host *host)
{
- return nlm_cmp_addr(&host->h_saddr, datap);
+ return nlm_cmp_addr(nlm_srcaddr_in(host), datap);
}

/**
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index 217b32a..8834d31 100644
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -40,7 +40,7 @@ struct nlm_host {
struct hlist_node h_hash; /* doubly linked list */
struct sockaddr_storage h_addr; /* peer address */
size_t h_addrlen;
- struct sockaddr_in h_saddr; /* our address (optional) */
+ struct sockaddr_storage h_srcaddr; /* our address (optional) */
struct rpc_clnt * h_rpcclnt; /* RPC client to talk to peer */
char * h_name; /* remote hostname */
u32 h_version; /* interface version */
@@ -64,7 +64,7 @@ struct nlm_host {
struct nsm_handle * h_nsmhandle; /* NSM status handle */

char h_addrbuf[48], /* address eyecatchers */
- h_saddrbuf[48];
+ h_srcaddrbuf[48];
};

struct nsm_handle {
@@ -89,6 +89,16 @@ static inline struct sockaddr *nlm_addr(const struct nlm_host *host)
return (struct sockaddr *)&host->h_addr;
}

+static inline struct sockaddr_in *nlm_srcaddr_in(const struct nlm_host *host)
+{
+ return (struct sockaddr_in *)&host->h_srcaddr;
+}
+
+static inline struct sockaddr *nlm_srcaddr(const struct nlm_host *host)
+{
+ return (struct sockaddr *)&host->h_srcaddr;
+}
+
/*
* Map an fl_owner_t into a unique 32-bit "pid"
*/