Commit cd738ee9 authored by Kinglong Mee's avatar Kinglong Mee Committed by Trond Myklebust

nfs: Remove unneeded micro checking of CONFIG_PROC_FS

Have checking CONFIG_PROC_FS in include/linux/sunrpc/stats.h.
Signed-off-by: default avatarKinglong Mee <kinglongmee@gmail.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 2785110d
...@@ -2010,17 +2010,15 @@ static int __init init_nfs_fs(void) ...@@ -2010,17 +2010,15 @@ static int __init init_nfs_fs(void)
if (err) if (err)
goto out1; goto out1;
#ifdef CONFIG_PROC_FS
rpc_proc_register(&init_net, &nfs_rpcstat); rpc_proc_register(&init_net, &nfs_rpcstat);
#endif
if ((err = register_nfs_fs()) != 0) err = register_nfs_fs();
if (err)
goto out0; goto out0;
return 0; return 0;
out0: out0:
#ifdef CONFIG_PROC_FS
rpc_proc_unregister(&init_net, "nfs"); rpc_proc_unregister(&init_net, "nfs");
#endif
nfs_destroy_directcache(); nfs_destroy_directcache();
out1: out1:
nfs_destroy_writepagecache(); nfs_destroy_writepagecache();
...@@ -2051,9 +2049,7 @@ static void __exit exit_nfs_fs(void) ...@@ -2051,9 +2049,7 @@ static void __exit exit_nfs_fs(void)
nfs_destroy_nfspagecache(); nfs_destroy_nfspagecache();
nfs_fscache_unregister(); nfs_fscache_unregister();
unregister_pernet_subsys(&nfs_net_ops); unregister_pernet_subsys(&nfs_net_ops);
#ifdef CONFIG_PROC_FS
rpc_proc_unregister(&init_net, "nfs"); rpc_proc_unregister(&init_net, "nfs");
#endif
unregister_nfs_fs(); unregister_nfs_fs();
nfs_fs_proc_exit(); nfs_fs_proc_exit();
nfsiod_stop(); nfsiod_stop();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment