nfsd: cleanup nfsd module initialization cleanup

Handle the failure case here with something closer to the standard
kernel style.

Doesn't really matter for now, but I'd like to add a few more failure
cases, and then this'll help.

Acked-by: NeilBrown <neilb@suse.de>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index d8d50a773a5bbb38cceca1bb9ee32f056ebf2bcb..ecf37794428659ff808c05de45206c79c620176d 100644 (file)
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -694,16 +694,18 @@ static int __init init_nfsd(void)
                        entry->proc_fops =  &exports_operations;
        }
        retval = register_filesystem(&nfsd_fs_type);
-       if (retval) {
-               nfsd_idmap_shutdown();
-               nfsd_export_shutdown();
-               nfsd_cache_shutdown();
-               remove_proc_entry("fs/nfs/exports", NULL);
-               remove_proc_entry("fs/nfs", NULL);
-               nfsd_stat_shutdown();
-               nfsd_lockd_shutdown();
-               nfsd4_free_slabs();
-       }
+       if (retval)
+               goto out_free_all;
+       return 0;
+out_free_all:
+       nfsd_idmap_shutdown();
+       nfsd_export_shutdown();
+       nfsd_cache_shutdown();
+       remove_proc_entry("fs/nfs/exports", NULL);
+       remove_proc_entry("fs/nfs", NULL);
+       nfsd_stat_shutdown();
+       nfsd_lockd_shutdown();
+       nfsd4_free_slabs();
        return retval;
 }