Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a83e289 authored by lizhe's avatar lizhe Committed by Greg Kroah-Hartman
Browse files

jffs2: Allow setting rp_size to zero during remounting 



[ Upstream commit cd3ed3c73ac671ff6b0230ccb72b8300292d3643 ]

Set rp_size to zero will be ignore during remounting.

The method to identify whether we input a remounting option of
rp_size is to check if the rp_size input is zero. It can not work
well if we pass "rp_size=0".

This patch add a bool variable "set_rp_size" to fix this problem.

Reported-by: default avatarJubin Zhong <zhongjubin@huawei.com>
Signed-off-by: default avatarlizhe <lizhe67@huawei.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ee78e7d9

fs/jffs2/jffs2_fs_sb.h

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ struct jffs2_mount_opts { 
	 * users. This is implemented simply by means of not allowing the

	 * latter users to write to the file system if the amount if the

	 * available space is less then 'rp_size'. */

	bool set_rp_size;

	unsigned int rp_size;

};

fs/jffs2/super.c

+5 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static int jffs2_show_options(struct seq_file *s, struct dentry *root) 


	if (opts->override_compr)

		seq_printf(s, ",compr=%s", jffs2_compr_name(opts->compr));

	if (opts->rp_size)

	if (opts->set_rp_size)

		seq_printf(s, ",rp_size=%u", opts->rp_size / 1024);



	return 0;
@@ -212,6 +212,7 @@ static int jffs2_parse_param(struct fs_context *fc, struct fs_parameter *param) 
		if (opt > c->mtd->size)

			return invalf(fc, "jffs2: Too large reserve pool specified, max is %llu KB",

				      c->mtd->size / 1024);

		c->mount_opts.set_rp_size = true;

		c->mount_opts.rp_size = opt;

		break;

	default:
@@ -231,8 +232,10 @@ static inline void jffs2_update_mount_opts(struct fs_context *fc) 
		c->mount_opts.override_compr = new_c->mount_opts.override_compr;

		c->mount_opts.compr = new_c->mount_opts.compr;

	}

	if (new_c->mount_opts.rp_size)

	if (new_c->mount_opts.set_rp_size) {

		c->mount_opts.set_rp_size = new_c->mount_opts.set_rp_size;

		c->mount_opts.rp_size = new_c->mount_opts.rp_size;

	}

	mutex_unlock(&c->alloc_sem);

}