diff options
-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 14b4709b9242..b77b328a06d7 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c | |||
@@ -2010,17 +2010,15 @@ static int __init init_nfs_fs(void) | |||
2010 | if (err) | 2010 | if (err) |
2011 | goto out1; | 2011 | goto out1; |
2012 | 2012 | ||
2013 | #ifdef CONFIG_PROC_FS | ||
2014 | rpc_proc_register(&init_net, &nfs_rpcstat); | 2013 | rpc_proc_register(&init_net, &nfs_rpcstat); |
2015 | #endif | 2014 | |
2016 | if ((err = register_nfs_fs()) != 0) | 2015 | err = register_nfs_fs(); |
2016 | if (err) | ||
2017 | goto out0; | 2017 | goto out0; |
2018 | 2018 | ||
2019 | return 0; | 2019 | return 0; |
2020 | out0: | 2020 | out0: |
2021 | #ifdef CONFIG_PROC_FS | ||
2022 | rpc_proc_unregister(&init_net, "nfs"); | 2021 | rpc_proc_unregister(&init_net, "nfs"); |
2023 | #endif | ||
2024 | nfs_destroy_directcache(); | 2022 | nfs_destroy_directcache(); |
2025 | out1: | 2023 | out1: |
2026 | nfs_destroy_writepagecache(); | 2024 | nfs_destroy_writepagecache(); |
@@ -2051,9 +2049,7 @@ static void __exit exit_nfs_fs(void) | |||
2051 | nfs_destroy_nfspagecache(); | 2049 | nfs_destroy_nfspagecache(); |
2052 | nfs_fscache_unregister(); | 2050 | nfs_fscache_unregister(); |
2053 | unregister_pernet_subsys(&nfs_net_ops); | 2051 | unregister_pernet_subsys(&nfs_net_ops); |
2054 | #ifdef CONFIG_PROC_FS | ||
2055 | rpc_proc_unregister(&init_net, "nfs"); | 2052 | rpc_proc_unregister(&init_net, "nfs"); |
2056 | #endif | ||
2057 | unregister_nfs_fs(); | 2053 | unregister_nfs_fs(); |
2058 | nfs_fs_proc_exit(); | 2054 | nfs_fs_proc_exit(); |
2059 | nfsiod_stop(); | 2055 | nfsiod_stop(); |