knfsd: allow cache_register to return error on failure

Newer server features such as nfsv4 and gss depend on proc to work, so a
failure to initialize the proc files they need should be treated as
fatal.

Thanks to Andrew Morton for style fix and compile fix in case where
CONFIG_NFSD_V4 is undefined.

Cc: Andrew Morton <akpm@linux-foundation.org>
Acked-by: NeilBrown <neilb@suse.de>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

1 files changed, 9 insertions, 3 deletions

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 2b95597aa4a5..4aba92698581 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -707,9 +707,13 @@ static int __init init_nfsd(void)
         retval = nfsd_reply_cache_init();
         if (retval)
                 goto out_free_stat;
-        nfsd_export_init();     /* Exports table */
+        retval = nfsd_export_init();
+        if (retval)
+                goto out_free_cache;
         nfsd_lockd_init();      /* lockd->nfsd callbacks */
-        nfsd_idmap_init();      /* Name to ID mapping */
+        retval = nfsd_idmap_init();
+        if (retval)
+                goto out_free_lockd;
         retval = create_proc_exports_entry();
         if (retval)
                 goto out_free_idmap;
@@ -720,10 +724,12 @@ static int __init init_nfsd(void)
 out_free_all:
         remove_proc_entry("fs/nfs/exports", NULL);
         remove_proc_entry("fs/nfs", NULL);
-        nfsd_idmap_shutdown();
 out_free_idmap:
+        nfsd_idmap_shutdown();
+out_free_lockd:
         nfsd_lockd_shutdown();
         nfsd_export_shutdown();
+out_free_cache:
         nfsd_reply_cache_shutdown();
 out_free_stat:
         nfsd_stat_shutdown();