Commit 1443f76b authored by Chen Hanxiao's avatar Chen Hanxiao Committed by Trond Myklebust
Browse files

nfs: fix regression in handling of fsc= option in NFSv4 



Setting the uniquifier for fscache via the fsc= mount
option is currently broken in NFSv4.

Fix this by passing fscache_uniq to root_fc if possible.

Signed-off-by: default avatarChen Hanxiao <chenhx.fnst@fujitsu.com>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 47f7c956

fs/nfs/nfs4super.c

+24 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ static int do_nfs4_mount(struct nfs_server *server, 
			 const char *export_path)

{

	struct nfs_fs_context *root_ctx;

	struct nfs_fs_context *ctx;

	struct fs_context *root_fc;

	struct vfsmount *root_mnt;

	struct dentry *dentry;
@@ -157,6 +158,12 @@ static int do_nfs4_mount(struct nfs_server *server, 
		.dirfd	= -1,

	};



	struct fs_parameter param_fsc = {

		.key	= "fsc",

		.type	= fs_value_is_string,

		.dirfd	= -1,

	};



	if (IS_ERR(server))

		return PTR_ERR(server);
@@ -168,9 +175,26 @@ static int do_nfs4_mount(struct nfs_server *server, 
	kfree(root_fc->source);

	root_fc->source = NULL;



	ctx = nfs_fc2context(fc);

	root_ctx = nfs_fc2context(root_fc);

	root_ctx->internal = true;

	root_ctx->server = server;



	if (ctx->fscache_uniq) {

		len = strlen(ctx->fscache_uniq);

		param_fsc.size = len;

		param_fsc.string = kmemdup_nul(ctx->fscache_uniq, len, GFP_KERNEL);

		if (param_fsc.string == NULL) {

			put_fs_context(root_fc);

			return -ENOMEM;

		}

		ret = vfs_parse_fs_param(root_fc, &param_fsc);

		kfree(param_fsc.string);

		if (ret < 0) {

			put_fs_context(root_fc);

			return ret;

		}

	}

	/* We leave export_path unset as it's not used to find the root. */



	len = strlen(hostname) + 5;