diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2008-09-03 20:36:01 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2008-09-30 00:13:39 +0200 |
| commit | 781b61a6f4ff94cb8c14cf598b547f5d5c490969 (patch) | |
| tree | 166288be121563b77c3672b311bbbe2541de3bd3 /fs/lockd/clntlock.c | |
| parent | NSM: Use sockaddr_storage for sm_addr field (diff) | |
| download | linux-781b61a6f4ff94cb8c14cf598b547f5d5c490969.tar.xz linux-781b61a6f4ff94cb8c14cf598b547f5d5c490969.zip | |
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>
Diffstat (limited to 'fs/lockd/clntlock.c')
| -rw-r--r-- | fs/lockd/clntlock.c | 3 |
1 files changed, 2 insertions, 1 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; |