diff options
author | Pavel Emelyanov <xemul@parallels.com> | 2010-09-27 05:59:48 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2010-09-27 10:16:11 -0400 |
commit | 352114f395bd79353faf0bc1506ead94de393f55 (patch) | |
tree | 46d9001aff3738afd13323fc883d89b7e8a74450 /fs/nfsd | |
parent | 3be4479fdf2fb7eb17a4592917ae4b536058b0c7 (diff) |
sunrpc: Add net to pure API calls
There are two calls that operate on ip_map_cache and are
directly called from the nfsd code. Other places will be
handled in a different way.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
-rw-r--r-- | fs/nfsd/export.c | 2 | ||||
-rw-r--r-- | fs/nfsd/nfsctl.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c index 067e2e612e2d..c0fcb7ab7f6d 100644 --- a/fs/nfsd/export.c +++ b/fs/nfsd/export.c | |||
@@ -1593,7 +1593,7 @@ exp_addclient(struct nfsctl_client *ncp) | |||
1593 | /* Insert client into hashtable. */ | 1593 | /* Insert client into hashtable. */ |
1594 | for (i = 0; i < ncp->cl_naddr; i++) { | 1594 | for (i = 0; i < ncp->cl_naddr; i++) { |
1595 | ipv6_addr_set_v4mapped(ncp->cl_addrlist[i].s_addr, &addr6); | 1595 | ipv6_addr_set_v4mapped(ncp->cl_addrlist[i].s_addr, &addr6); |
1596 | auth_unix_add_addr(&addr6, dom); | 1596 | auth_unix_add_addr(&init_net, &addr6, dom); |
1597 | } | 1597 | } |
1598 | auth_unix_forget_old(dom); | 1598 | auth_unix_forget_old(dom); |
1599 | auth_domain_put(dom); | 1599 | auth_domain_put(dom); |
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index 7b2fa1d25af7..b6e192d25633 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c | |||
@@ -416,7 +416,7 @@ static ssize_t write_getfs(struct file *file, char *buf, size_t size) | |||
416 | 416 | ||
417 | ipv6_addr_set_v4mapped(sin->sin_addr.s_addr, &in6); | 417 | ipv6_addr_set_v4mapped(sin->sin_addr.s_addr, &in6); |
418 | 418 | ||
419 | clp = auth_unix_lookup(&in6); | 419 | clp = auth_unix_lookup(&init_net, &in6); |
420 | if (!clp) | 420 | if (!clp) |
421 | err = -EPERM; | 421 | err = -EPERM; |
422 | else { | 422 | else { |
@@ -479,7 +479,7 @@ static ssize_t write_getfd(struct file *file, char *buf, size_t size) | |||
479 | 479 | ||
480 | ipv6_addr_set_v4mapped(sin->sin_addr.s_addr, &in6); | 480 | ipv6_addr_set_v4mapped(sin->sin_addr.s_addr, &in6); |
481 | 481 | ||
482 | clp = auth_unix_lookup(&in6); | 482 | clp = auth_unix_lookup(&init_net, &in6); |
483 | if (!clp) | 483 | if (!clp) |
484 | err = -EPERM; | 484 | err = -EPERM; |
485 | else { | 485 | else { |