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>

2 files changed, 7 insertions, 6 deletions

diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c
index 0b45fd3a4bfd..0df5587f804e 100644
--- a/fs/lockd/clntlock.c
+++ b/fs/lockd/clntlock.c
@@ -166,7 +166,7 @@ __be32 nlmclnt_grant(const struct sockaddr_in *addr, const struct nlm_lock *lock
                  */
                 if (fl_blocked->fl_u.nfs_fl.owner->pid != lock->svid)
                         continue;
-                if (!nlm_cmp_addr(&block->b_host->h_addr, addr))
+                if (!nlm_cmp_addr(nlm_addr_in(block->b_host), addr))
                         continue;
                 if (nfs_compare_fh(NFS_FH(fl_blocked->fl_file->f_path.dentry->d_inode) ,fh) != 0)
                         continue;
diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index 008e4026f540..8c7022eeae65 100644
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -116,7 +116,7 @@ static struct nlm_host *nlm_lookup_host(int server,
          */
         chain = &nlm_hosts[hash];
         hlist_for_each_entry(host, pos, chain, h_hash) {
-                if (!nlm_cmp_addr(&host->h_addr, sin))
+                if (!nlm_cmp_addr(nlm_addr_in(host), sin))
                         continue;
 
                 /* See if we have an NSM handle for this client */
@@ -165,8 +165,9 @@ static struct nlm_host *nlm_lookup_host(int server,
                 goto out;
         }
         host->h_name       = nsm->sm_name;
-        host->h_addr       = *sin;
-        nlm_clear_port((struct sockaddr *)&host->h_addr);
+        memcpy(nlm_addr(host), sin, sizeof(*sin));
+        host->h_addrlen = sizeof(*sin);
+        nlm_clear_port(nlm_addr(host));
         host->h_saddr      = *ssin;
         host->h_version    = version;
         host->h_proto      = proto;
@@ -291,8 +292,8 @@ nlm_bind_host(struct nlm_host *host)
                 };
                 struct rpc_create_args args = {
                         .protocol       = host->h_proto,
-                        .address        = (struct sockaddr *)&host->h_addr,
-                        .addrsize       = sizeof(host->h_addr),
+                        .address        = nlm_addr(host),
+                        .addrsize       = host->h_addrlen,
                         .saddress       = (struct sockaddr *)&host->h_saddr,
                         .timeout        = &timeparms,
                         .servername     = host->h_name,