Commit 15751612 authored Apr 15, 2020 by Dave Wysochanski Committed by David Howells May 08, 2020

NFS: Fix fscache super_cookie allocation



Commit f2aedb71 ("NFS: Add fs_context support.") reworked
NFS mount code paths for fs_context support which included
super_block initialization.  In the process there was an extra
return left in the code and so we never call
nfs_fscache_get_super_cookie even if 'fsc' is given on as mount
option.  In addition, there is an extra check inside
nfs_fscache_get_super_cookie for the NFS_OPTION_FSCACHE which
is unnecessary since the only caller nfs_get_cache_cookie
checks this flag.

Fixes: f2aedb71 ("NFS: Add fs_context support.")
Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
Signed-off-by: David Howells <dhowells@redhat.com>

parent d9bfced1

fs/nfs/fscache.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -118,8 +118,6 @@ void nfs_fscache_get_super_cookie(struct super_block sb, const char uniq, int

		nfss->fscache_key = NULL;
		nfss->fscache = NULL;
		if (!(nfss->options & NFS_OPTION_FSCACHE))
		return;
		if (!uniq) {
		uniq = "";
		ulen = 1;

fs/nfs/super.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -1189,7 +1189,6 @@ static void nfs_get_cache_cookie(struct super_block *sb,
		uniq = ctx->fscache_uniq;
		ulen = strlen(ctx->fscache_uniq);
		}
		return;
		}

		nfs_fscache_get_super_cookie(sb, uniq, ulen);

Admin message