diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/lockd/clntlock.c | 3 | ||||
-rw-r--r-- | fs/lockd/host.c | 6 | ||||
-rw-r--r-- | fs/lockd/svcsubs.c | 2 |
3 files changed, 6 insertions, 5 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 | |||
166 | */ | 166 | */ |
167 | if (fl_blocked->fl_u.nfs_fl.owner->pid != lock->svid) | 167 | if (fl_blocked->fl_u.nfs_fl.owner->pid != lock->svid) |
168 | continue; | 168 | continue; |
169 | if (!nlm_cmp_addr(nlm_addr_in(block->b_host), addr)) | 169 | if (!nlm_cmp_addr(nlm_addr(block->b_host), |
170 | (struct sockaddr *)addr)) | ||
170 | continue; | 171 | continue; |
171 | if (nfs_compare_fh(NFS_FH(fl_blocked->fl_file->f_path.dentry->d_inode) ,fh) != 0) | 172 | if (nfs_compare_fh(NFS_FH(fl_blocked->fl_file->f_path.dentry->d_inode) ,fh) != 0) |
172 | continue; | 173 | continue; |
diff --git a/fs/lockd/host.c b/fs/lockd/host.c index 510ebcf485f0..dbf3fe620a0c 100644 --- a/fs/lockd/host.c +++ b/fs/lockd/host.c | |||
@@ -116,7 +116,7 @@ static struct nlm_host *nlm_lookup_host(int server, | |||
116 | */ | 116 | */ |
117 | chain = &nlm_hosts[hash]; | 117 | chain = &nlm_hosts[hash]; |
118 | hlist_for_each_entry(host, pos, chain, h_hash) { | 118 | hlist_for_each_entry(host, pos, chain, h_hash) { |
119 | if (!nlm_cmp_addr(nlm_addr_in(host), sin)) | 119 | if (!nlm_cmp_addr(nlm_addr(host), (struct sockaddr *)sin)) |
120 | continue; | 120 | continue; |
121 | 121 | ||
122 | /* See if we have an NSM handle for this client */ | 122 | /* See if we have an NSM handle for this client */ |
@@ -129,7 +129,7 @@ static struct nlm_host *nlm_lookup_host(int server, | |||
129 | continue; | 129 | continue; |
130 | if (host->h_server != server) | 130 | if (host->h_server != server) |
131 | continue; | 131 | continue; |
132 | if (!nlm_cmp_addr(nlm_srcaddr_in(host), ssin)) | 132 | if (!nlm_cmp_addr(nlm_srcaddr(host), (struct sockaddr *)ssin)) |
133 | continue; | 133 | continue; |
134 | 134 | ||
135 | /* Move to head of hash chain. */ | 135 | /* Move to head of hash chain. */ |
@@ -551,7 +551,7 @@ retry: | |||
551 | if (strlen(pos->sm_name) != hostname_len | 551 | if (strlen(pos->sm_name) != hostname_len |
552 | || memcmp(pos->sm_name, hostname, hostname_len)) | 552 | || memcmp(pos->sm_name, hostname, hostname_len)) |
553 | continue; | 553 | continue; |
554 | } else if (!nlm_cmp_addr(nsm_addr_in(pos), sin)) | 554 | } else if (!nlm_cmp_addr(nsm_addr(pos), (struct sockaddr *)sin)) |
555 | continue; | 555 | continue; |
556 | atomic_inc(&pos->sm_count); | 556 | atomic_inc(&pos->sm_count); |
557 | kfree(nsm); | 557 | kfree(nsm); |
diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c index d3d1330d7c27..34c2766e27c7 100644 --- a/fs/lockd/svcsubs.c +++ b/fs/lockd/svcsubs.c | |||
@@ -418,7 +418,7 @@ EXPORT_SYMBOL_GPL(nlmsvc_unlock_all_by_sb); | |||
418 | static int | 418 | static int |
419 | nlmsvc_match_ip(void *datap, struct nlm_host *host) | 419 | nlmsvc_match_ip(void *datap, struct nlm_host *host) |
420 | { | 420 | { |
421 | return nlm_cmp_addr(nlm_srcaddr_in(host), datap); | 421 | return nlm_cmp_addr(nlm_srcaddr(host), datap); |
422 | } | 422 | } |
423 | 423 | ||
424 | /** | 424 | /** |