NFSD: Mark filecache "down" if init fails

NeilBrown says:
> The handling of NFSD_FILE_CACHE_UP is strange.  nfsd_file_cache_init()
> sets it, but doesn't clear it on failure.  So if nfsd_file_cache_init()
> fails for some reason, nfsd_file_cache_shutdown() would still try to
> clean up if it was called.

Reported-by: NeilBrown <[email protected]>
Fixes: c7b824c3d06c ("NFSD: Replace the "init once" mechanism")
Signed-off-by: Chuck Lever <[email protected]>

diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c
index 24e8f1fbcebbb7385dd3ec34ac2605d31bc4d564..2603183305b42cc6a8efa63fc72fc46d6683307b 100644 (file)
--- a/fs/nfsd/filecache.c
+++ b/fs/nfsd/filecache.c
@@ -723,7 +723,7 @@ nfsd_file_cache_init(void)
 
        ret = rhltable_init(&nfsd_file_rhltable, &nfsd_file_rhash_params);
        if (ret)
-               return ret;
+               goto out;
 
        ret = -ENOMEM;
        nfsd_file_slab = KMEM_CACHE(nfsd_file, 0);
@@ -775,6 +775,8 @@ nfsd_file_cache_init(void)
 
        INIT_DELAYED_WORK(&nfsd_filecache_laundrette, nfsd_file_gc_worker);
 out:
+       if (ret)
+               clear_bit(NFSD_FILE_CACHE_UP, &nfsd_file_flags);
        return ret;
 out_notifier:
        lease_unregister_notifier(&nfsd_file_lease_notifier);