lockd: Adjust nlmclnt_lookup_host() signature to accomodate non-AF_INET

Pass a struct sockaddr * and a length to nlmclnt_lookup_host() to
accomodate non-AF_INET family addresses.

As a side benefit, eliminate the hostname_len argument, as the hostname
is always NUL-terminated.

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

1 files changed, 2 insertions, 3 deletions

diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c
index 237224a3c420..9eaf306d15fa 100644
--- a/fs/lockd/clntlock.c
+++ b/fs/lockd/clntlock.c
@@ -58,10 +58,9 @@ struct nlm_host *nlmclnt_init(const struct nlmclnt_initdata *nlm_init)
         if (status < 0)
                 return ERR_PTR(status);
 
-        host = nlmclnt_lookup_host((struct sockaddr_in *)nlm_init->address,
+        host = nlmclnt_lookup_host(nlm_init->address, nlm_init->addrlen,
                                    nlm_init->protocol, nlm_version,
-                                   nlm_init->hostname,
-                                   strlen(nlm_init->hostname));
+                                   nlm_init->hostname);
         if (host == NULL) {
                 lockd_down();
                 return ERR_PTR(-ENOLCK);