|
@@ -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();
|