diff options
| author | Kinglong Mee <kinglongmee@gmail.com> | 2015-07-01 11:58:31 +0800 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-07-01 11:30:45 -0400 |
| commit | cd738ee985ccc1162e7ba2b4ecd41b6072a5befc (patch) | |
| tree | c7951a618dd81422277da59ddf046fbf73dbdeac | |
| parent | 2785110d2e5c5bad54c8364391e02e3dd21eccf3 (diff) | |
| download | op-kernel-dev-cd738ee985ccc1162e7ba2b4ecd41b6072a5befc.zip op-kernel-dev-cd738ee985ccc1162e7ba2b4ecd41b6072a5befc.tar.gz | |
nfs: Remove unneeded micro checking of CONFIG_PROC_FS
Have checking CONFIG_PROC_FS in include/linux/sunrpc/stats.h.
Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
| -rw-r--r-- | fs/nfs/inode.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 14b4709..b77b328 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -2010,17 +2010,15 @@ static int __init init_nfs_fs(void) if (err) goto out1; -#ifdef CONFIG_PROC_FS rpc_proc_register(&init_net, &nfs_rpcstat); -#endif - if ((err = register_nfs_fs()) != 0) + + err = register_nfs_fs(); + if (err) goto out0; return 0; out0: -#ifdef CONFIG_PROC_FS rpc_proc_unregister(&init_net, "nfs"); -#endif nfs_destroy_directcache(); out1: nfs_destroy_writepagecache(); @@ -2051,9 +2049,7 @@ static void __exit exit_nfs_fs(void) nfs_destroy_nfspagecache(); nfs_fscache_unregister(); unregister_pernet_subsys(&nfs_net_ops); -#ifdef CONFIG_PROC_FS rpc_proc_unregister(&init_net, "nfs"); -#endif unregister_nfs_fs(); nfs_fs_proc_exit(); nfsiod_stop(); |
