diff options
| author |   Chuck Lever <chuck.lever@oracle.com> | 2008-10-03 12:50:21 -0400 |
|---|---|---|
| committer |   J. Bruce Fields <bfields@citi.umich.edu> | 2008-10-03 17:02:34 -0400 |
| commit | d7d204403b31beb83b1aefef7bd76f5209369555 (patch) | |
| tree | 70d63b581d4987fb12cc455f741bf21a55a7a8c3 /fs/lockd/clntlock.c | |
| parent | lockd: Support non-AF_INET addresses in nlm_lookup_host() (diff) | |
| download | linux-dev-d7d204403b31beb83b1aefef7bd76f5209369555.tar.xz linux-dev-d7d204403b31beb83b1aefef7bd76f5209369555.zip | |
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>
Diffstat (limited to 'fs/lockd/clntlock.c')
| -rw-r--r-- | fs/lockd/clntlock.c | 5 |
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); |