Commit da685edf authored by Chuck Lever's avatar Chuck Lever Committed by Li Lingfeng
Browse files

NFSD: Mark filecache "down" if init fails 

stable inclusion
from stable-v6.6.57
commit 4ab072325c621e0e4fadff991c7a00379a16a037
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB22IQ

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=4ab072325c621e0e4fadff991c7a00379a16a037



--------------------------------

[ Upstream commit dc0d0f885aa422f621bc1c2124133eff566b0bc8 ]

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: default avatarNeilBrown <neilb@suse.de>
Fixes: c7b824c3 ("NFSD: Replace the "init once" mechanism")
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarLi Lingfeng <lilingfeng3@huawei.com>
parent ed0a2bc9

fs/nfsd/filecache.c

+3 −1
Original line number Diff line number Diff line
@@ -718,7 +718,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_filecache_wq = alloc_workqueue("nfsd_filecache", 0, 0);
@@ -770,6 +770,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);