lockd: Teach nlm_cmp_addr() to support AF_INET6 addresses

Update the nlm_cmp_addr() helper to support AF_INET6 as well as AF_INET
addresses.  New version takes two "struct sockaddr *" arguments instead of
"struct sockaddr_in *" arguments.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

3 files changed, 6 insertions, 5 deletions

diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c
index 0df5587f804e..237224a3c420 100644
--- a/fs/lockd/clntlock.c
+++ b/fs/lockd/clntlock.c
@@ -166,7 +166,8 @@ __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(nlm_addr_in(block->b_host), addr))
+                if (!nlm_cmp_addr(nlm_addr(block->b_host),
+                                        (struct sockaddr *)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 510ebcf485f0..dbf3fe620a0c 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(nlm_addr_in(host), sin))
+                if (!nlm_cmp_addr(nlm_addr(host), (struct sockaddr *)sin))
                         continue;
 
                 /* See if we have an NSM handle for this client */
@@ -129,7 +129,7 @@ static struct nlm_host *nlm_lookup_host(int server,
                         continue;
                 if (host->h_server != server)
                         continue;
-                if (!nlm_cmp_addr(nlm_srcaddr_in(host), ssin))
+                if (!nlm_cmp_addr(nlm_srcaddr(host), (struct sockaddr *)ssin))
                         continue;
 
                 /* Move to head of hash chain. */
@@ -551,7 +551,7 @@ retry:
                         if (strlen(pos->sm_name) != hostname_len
                          || memcmp(pos->sm_name, hostname, hostname_len))
                                 continue;
-                } else if (!nlm_cmp_addr(nsm_addr_in(pos), sin))
+                } else if (!nlm_cmp_addr(nsm_addr(pos), (struct sockaddr *)sin))
                         continue;
                 atomic_inc(&pos->sm_count);
                 kfree(nsm);
diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c
index d3d1330d7c27..34c2766e27c7 100644
--- a/fs/lockd/svcsubs.c
+++ b/fs/lockd/svcsubs.c
@@ -418,7 +418,7 @@ EXPORT_SYMBOL_GPL(nlmsvc_unlock_all_by_sb);
 static int
 nlmsvc_match_ip(void *datap, struct nlm_host *host)
 {
-        return nlm_cmp_addr(nlm_srcaddr_in(host), datap);
+        return nlm_cmp_addr(nlm_srcaddr(host), datap);
 }
 
 /**