Commit 84c21507 authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

fuse: name fs_context consistently 



Naming convention under fs/fuse/:

	struct fuse_conn *fc;
	struct fs_context *fsc;

Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent e1e71c16

fs/fuse/control.c

+5 −5
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ void fuse_ctl_remove_conn(struct fuse_conn *fc) 
	drop_nlink(d_inode(fuse_control_sb->s_root));

}



static int fuse_ctl_fill_super(struct super_block *sb, struct fs_context *fctx)

static int fuse_ctl_fill_super(struct super_block *sb, struct fs_context *fsc)

{

	static const struct tree_descr empty_descr = {""};

	struct fuse_conn *fc;
@@ -354,18 +354,18 @@ static int fuse_ctl_fill_super(struct super_block *sb, struct fs_context *fctx) 
	return 0;

}



static int fuse_ctl_get_tree(struct fs_context *fc)

static int fuse_ctl_get_tree(struct fs_context *fsc)

{

	return get_tree_single(fc, fuse_ctl_fill_super);

	return get_tree_single(fsc, fuse_ctl_fill_super);

}



static const struct fs_context_operations fuse_ctl_context_ops = {

	.get_tree	= fuse_ctl_get_tree,

};



static int fuse_ctl_init_fs_context(struct fs_context *fc)

static int fuse_ctl_init_fs_context(struct fs_context *fsc)

{

	fc->ops = &fuse_ctl_context_ops;

	fsc->ops = &fuse_ctl_context_ops;

	return 0;

}

fs/fuse/inode.c

+30 −30
Original line number Diff line number Diff line
@@ -138,12 +138,12 @@ static void fuse_evict_inode(struct inode *inode) 
	}

}



static int fuse_reconfigure(struct fs_context *fc)

static int fuse_reconfigure(struct fs_context *fsc)

{

	struct super_block *sb = fc->root->d_sb;

	struct super_block *sb = fsc->root->d_sb;



	sync_filesystem(sb);

	if (fc->sb_flags & SB_MANDLOCK)

	if (fsc->sb_flags & SB_MANDLOCK)

		return -EINVAL;



	return 0;
@@ -573,38 +573,38 @@ static const struct fs_parameter_spec fuse_fs_parameters[] = { 
	{}

};



static int fuse_parse_param(struct fs_context *fc, struct fs_parameter *param)

static int fuse_parse_param(struct fs_context *fsc, struct fs_parameter *param)

{

	struct fs_parse_result result;

	struct fuse_fs_context *ctx = fc->fs_private;

	struct fuse_fs_context *ctx = fsc->fs_private;

	int opt;



	if (fc->purpose == FS_CONTEXT_FOR_RECONFIGURE) {

	if (fsc->purpose == FS_CONTEXT_FOR_RECONFIGURE) {

		/*

		 * Ignore options coming from mount(MS_REMOUNT) for backward

		 * compatibility.

		 */

		if (fc->oldapi)

		if (fsc->oldapi)

			return 0;



		return invalfc(fc, "No changes allowed in reconfigure");

		return invalfc(fsc, "No changes allowed in reconfigure");

	}



	opt = fs_parse(fc, fuse_fs_parameters, param, &result);

	opt = fs_parse(fsc, fuse_fs_parameters, param, &result);

	if (opt < 0)

		return opt;



	switch (opt) {

	case OPT_SOURCE:

		if (fc->source)

			return invalfc(fc, "Multiple sources specified");

		fc->source = param->string;

		if (fsc->source)

			return invalfc(fsc, "Multiple sources specified");

		fsc->source = param->string;

		param->string = NULL;

		break;



	case OPT_SUBTYPE:

		if (ctx->subtype)

			return invalfc(fc, "Multiple subtypes specified");

			return invalfc(fsc, "Multiple subtypes specified");

		ctx->subtype = param->string;

		param->string = NULL;

		return 0;
@@ -616,22 +616,22 @@ static int fuse_parse_param(struct fs_context *fc, struct fs_parameter *param) 


	case OPT_ROOTMODE:

		if (!fuse_valid_type(result.uint_32))

			return invalfc(fc, "Invalid rootmode");

			return invalfc(fsc, "Invalid rootmode");

		ctx->rootmode = result.uint_32;

		ctx->rootmode_present = true;

		break;



	case OPT_USER_ID:

		ctx->user_id = make_kuid(fc->user_ns, result.uint_32);

		ctx->user_id = make_kuid(fsc->user_ns, result.uint_32);

		if (!uid_valid(ctx->user_id))

			return invalfc(fc, "Invalid user_id");

			return invalfc(fsc, "Invalid user_id");

		ctx->user_id_present = true;

		break;



	case OPT_GROUP_ID:

		ctx->group_id = make_kgid(fc->user_ns, result.uint_32);

		ctx->group_id = make_kgid(fsc->user_ns, result.uint_32);

		if (!gid_valid(ctx->group_id))

			return invalfc(fc, "Invalid group_id");

			return invalfc(fsc, "Invalid group_id");

		ctx->group_id_present = true;

		break;
@@ -649,7 +649,7 @@ static int fuse_parse_param(struct fs_context *fc, struct fs_parameter *param) 


	case OPT_BLKSIZE:

		if (!ctx->is_bdev)

			return invalfc(fc, "blksize only supported for fuseblk");

			return invalfc(fsc, "blksize only supported for fuseblk");

		ctx->blksize = result.uint_32;

		break;
@@ -660,9 +660,9 @@ static int fuse_parse_param(struct fs_context *fc, struct fs_parameter *param) 
	return 0;

}



static void fuse_free_fc(struct fs_context *fc)

static void fuse_free_fsc(struct fs_context *fsc)

{

	struct fuse_fs_context *ctx = fc->fs_private;

	struct fuse_fs_context *ctx = fsc->fs_private;



	if (ctx) {

		kfree(ctx->subtype);
@@ -1566,9 +1566,9 @@ static int fuse_fill_super(struct super_block *sb, struct fs_context *fsc) 
	return err;

}



static int fuse_get_tree(struct fs_context *fc)

static int fuse_get_tree(struct fs_context *fsc)

{

	struct fuse_fs_context *ctx = fc->fs_private;

	struct fuse_fs_context *ctx = fsc->fs_private;



	if (!ctx->fd_present || !ctx->rootmode_present ||

	    !ctx->user_id_present || !ctx->group_id_present)
@@ -1576,14 +1576,14 @@ static int fuse_get_tree(struct fs_context *fc) 


#ifdef CONFIG_BLOCK

	if (ctx->is_bdev)

		return get_tree_bdev(fc, fuse_fill_super);

		return get_tree_bdev(fsc, fuse_fill_super);

#endif



	return get_tree_nodev(fc, fuse_fill_super);

	return get_tree_nodev(fsc, fuse_fill_super);

}



static const struct fs_context_operations fuse_context_ops = {

	.free		= fuse_free_fc,

	.free		= fuse_free_fsc,

	.parse_param	= fuse_parse_param,

	.reconfigure	= fuse_reconfigure,

	.get_tree	= fuse_get_tree,
@@ -1592,7 +1592,7 @@ static const struct fs_context_operations fuse_context_ops = { 
/*

 * Set up the filesystem mount context.

 */

static int fuse_init_fs_context(struct fs_context *fc)

static int fuse_init_fs_context(struct fs_context *fsc)

{

	struct fuse_fs_context *ctx;
@@ -1605,14 +1605,14 @@ static int fuse_init_fs_context(struct fs_context *fc) 
	ctx->legacy_opts_show = true;



#ifdef CONFIG_BLOCK

	if (fc->fs_type == &fuseblk_fs_type) {

	if (fsc->fs_type == &fuseblk_fs_type) {

		ctx->is_bdev = true;

		ctx->destroy = true;

	}

#endif



	fc->fs_private = ctx;

	fc->ops = &fuse_context_ops;

	fsc->fs_private = ctx;

	fsc->ops = &fuse_context_ops;

	return 0;

}

fs/fuse/virtio_fs.c

+6 −6
Original line number Diff line number Diff line
@@ -97,14 +97,14 @@ static const struct fs_parameter_spec virtio_fs_parameters[] = { 
	{}

};



static int virtio_fs_parse_param(struct fs_context *fc,

static int virtio_fs_parse_param(struct fs_context *fsc,

				 struct fs_parameter *param)

{

	struct fs_parse_result result;

	struct fuse_fs_context *ctx = fc->fs_private;

	struct fuse_fs_context *ctx = fsc->fs_private;

	int opt;



	opt = fs_parse(fc, virtio_fs_parameters, param, &result);

	opt = fs_parse(fsc, virtio_fs_parameters, param, &result);

	if (opt < 0)

		return opt;
@@ -119,9 +119,9 @@ static int virtio_fs_parse_param(struct fs_context *fc, 
	return 0;

}



static void virtio_fs_free_fc(struct fs_context *fc)

static void virtio_fs_free_fsc(struct fs_context *fsc)

{

	struct fuse_fs_context *ctx = fc->fs_private;

	struct fuse_fs_context *ctx = fsc->fs_private;



	kfree(ctx);

}
@@ -1488,7 +1488,7 @@ static int virtio_fs_get_tree(struct fs_context *fsc) 
}



static const struct fs_context_operations virtio_fs_context_ops = {

	.free		= virtio_fs_free_fc,

	.free		= virtio_fs_free_fsc,

	.parse_param	= virtio_fs_parse_param,

	.get_tree	= virtio_fs_get_tree,

};