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>

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 14b4709b9242c2d78f24477a882d76f5350a4bac..b77b328a06d74f0124d2a65b51fac0fc21fbd692 100644 (file)
--- 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;
 
        if (err)
                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;
 
        return 0;
 out0:
                goto out0;
 
        return 0;
 out0:

-#ifdef CONFIG_PROC_FS

        rpc_proc_unregister(&init_net, "nfs");
        rpc_proc_unregister(&init_net, "nfs");

-#endif

        nfs_destroy_directcache();
 out1:
        nfs_destroy_writepagecache();
        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);
        nfs_destroy_nfspagecache();
        nfs_fscache_unregister();
        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();
        nfs_fs_proc_exit();
        nfsiod_stop();
        unregister_nfs_fs();
        nfs_fs_proc_exit();
        nfsiod_stop();