diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2008-09-03 14:35:39 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2008-09-29 18:13:39 -0400 |
| commit | b4ed58fd34d4def88bda59f9cc566ec9fca6a096 (patch) | |
| tree | ce377f9ec8773a26e4a967e7d73d42e99d39b0ea /fs/lockd/clntlock.c | |
| parent | 5344b12d4f97d4a9a62d806425977a6ff64b6baf (diff) | |
| download | linux-stable-b4ed58fd34d4def88bda59f9cc566ec9fca6a096.tar.gz linux-stable-b4ed58fd34d4def88bda59f9cc566ec9fca6a096.tar.bz2 linux-stable-b4ed58fd34d4def88bda59f9cc566ec9fca6a096.zip | |
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>
Diffstat (limited to 'fs/lockd/clntlock.c')
| -rw-r--r-- | fs/lockd/clntlock.c | 2 |
1 files changed, 1 insertions, 1 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; |