aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/inode.c
diff options
context:
space:
mode:
authorStanislav Kinsbursky <skinsbursky@parallels.com>2011-12-06 08:42:40 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-01-31 19:28:17 -0500
commitec7652aaf261b7dcb368344369df1e99886c7cd2 (patch)
tree0d21ca45022adb1221690cb5e368bc17d3f58531 /fs/nfs/inode.c
parent170942726b16a1dfcc605f0b510b9663b66fa7a3 (diff)
SUNRPC: register RPC stats /proc entries in passed network namespace context
This patch makes it possible to create NFS program entry ("/proc/net/rpc/nfs") in passed network namespace context instead of hard-coded "init_net". Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/inode.c')
-rw-r--r--fs/nfs/inode.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 65486e652943..d2c760e193f4 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -1625,14 +1625,14 @@ static int __init init_nfs_fs(void)
1625 goto out0; 1625 goto out0;
1626 1626
1627#ifdef CONFIG_PROC_FS 1627#ifdef CONFIG_PROC_FS
1628 rpc_proc_register(&nfs_rpcstat); 1628 rpc_proc_register(&init_net, &nfs_rpcstat);
1629#endif 1629#endif
1630 if ((err = register_nfs_fs()) != 0) 1630 if ((err = register_nfs_fs()) != 0)
1631 goto out; 1631 goto out;
1632 return 0; 1632 return 0;
1633out: 1633out:
1634#ifdef CONFIG_PROC_FS 1634#ifdef CONFIG_PROC_FS
1635 rpc_proc_unregister("nfs"); 1635 rpc_proc_unregister(&init_net, "nfs");
1636#endif 1636#endif
1637 nfs_destroy_directcache(); 1637 nfs_destroy_directcache();
1638out0: 1638out0:
@@ -1671,7 +1671,7 @@ static void __exit exit_nfs_fs(void)
1671 nfs_dns_resolver_destroy(); 1671 nfs_dns_resolver_destroy();
1672 nfs_idmap_quit(); 1672 nfs_idmap_quit();
1673#ifdef CONFIG_PROC_FS 1673#ifdef CONFIG_PROC_FS
1674 rpc_proc_unregister("nfs"); 1674 rpc_proc_unregister(&init_net, "nfs");
1675#endif 1675#endif
1676 nfs_cleanup_cb_ident_idr(); 1676 nfs_cleanup_cb_ident_idr();
1677 unregister_nfs_fs(); 1677 unregister_nfs_fs();