lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lockd: Teach nlm_cmp_addr() to support AF_INET6 addresses

Browse Source 
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>
This commit is contained in:
Chuck Lever
2008-09-03 14:36:01 -04:00
committed by J. Bruce Fields
parent 7e9d7746bf
commit 781b61a6f4
4 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fs/lockd/clntlock.c
View File

@@ -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;