jffs2: fix ignoring mounting options problem during remounting
PATCH 1/2 jffs2: fix ignoring mounting options problem during remounting
From: lizhe <[email protected]>
The jffs2 mount options will be ignored when remounting jffs2. It can be easily reproduced with the steps listed below.
1. mount -t jffs2 -o compr=none /dev/mtdblockx /mnt
2. mount -o remount compr=zlib /mnt
Since ec10a24f10c8, the option parsing happens before fill_super and then pass fc, which contains the options parsing results, to function jffs2_reconfigure during remounting. But function jffs2_reconfigure do not update c->mount_opts.
This patch add a function jffs2_update_mount_opts to fix this problem.
By the way, I notice that tmpfs use the same way to update remounting options. If it is necessary to unify them?
--- fs/jffs2/super.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
fs/jffs2/super.c +17 -0
@@ -215,11 +215,28 @@ static int jffs2_parse_param(struct fs_context *fc, struct fs_parameter *param)return 0 ; } +static inline void jffs2_update_mount_opts (struct fs_context *fc) +{ +struct jffs2_sb_info *new_c = fc->s_fs_info; +struct jffs2_sb_info *c =JFFS2_SB_INFO (fc->root->d_sb); + +mutex_lock (&c->alloc_sem); +if (new_c->mount_opts.override_compr) { + 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) + c->mount_opts.rp_size = new_c->mount_opts.rp_size; +mutex_unlock (&c->alloc_sem); +} +static int jffs2_reconfigure (struct fs_context *fc) {struct super_block *sb = fc->root->d_sb;sync_filesystem (sb); +jffs2_update_mount_opts (fc); +return jffs2_do_remount_fs (sb, fc); }
Signature · 1 line
2.12.3
PATCH 2/2 jffs2: fix can't set rp_size to zero during remounting
From: lizhe <[email protected]>
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.
By the way, the problem of NULL pointer dereference in rp_size fs option parsing showed at
https://lore.kernel.org/linux-mtd/[email protected]/T/#u
should be applyed before this patch to make sure it works well.
--- fs/jffs2/jffs2_fs_sb.h | 1 + fs/jffs2/super.c | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-)
fs/jffs2/jffs2_fs_sb.h +1 -0
@@ -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
@@ -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 ;
@@ -206,6 +206,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 :
@@ -225,8 +226,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); }
Signature · 1 line
2.12.3
Re: [PATCH 2/2] jffs2: fix can't set rp_size to zero during remounting
Maintainer ping?
Zhe
Quoted 69 lines · Zhe Li
Set
rp_sizeto zero will be ignore during remounting.The method to identify whether we input a remounting option of
rp_sizeis to check if therp_sizeinput 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.By the way, the problem of NULL pointer dereference in
rp_sizefs option parsing showed at
https://lore.kernel.org/linux-mtd/[email protected]/T/#u
should be applyed before this patch to make sure it works well.Reported-by Jubin Zhong <[email protected]>Signed-off-by lizhe <[email protected]>---
fs/jffs2/jffs2_fs_sb.h| 1 +fs/jffs2/super.c| 7 +++++--2 files changed, 6 insertions(+), 2 deletions(-)fs/jffs2/jffs2_fs_sb.h +1
-0@@ -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@@ -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 ;@@ -206,6 +206,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 :@@ -225,8 +226,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); }Signature · 1 line
2.12.3
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
Re: [PATCH 2/2] jffs2: fix can't set rp_size to zero during remounting
Quoted 2 lines · Zhe Li
Maintainer ping?
Didn't I reply to this series?
/me double checks sent folder.
Signature · 2 lines
Thanks, //richard
Maintainer ping?
Zhe
Quoted 57 lines · Zhe Li
The jffs2 mount options will be ignored when remounting jffs2. It can be easily reproduced with the steps listed below.
1. mount -t jffs2 -o compr=none/dev/mtdblockx/mnt
2. mount -o remount compr=zlib /mntSince
ec10a24f10c8, the option parsing happens beforefill_superand then pass fc, which contains the options parsing results, to functionjffs2_reconfigureduring remounting. But functionjffs2_reconfiguredo not updatec->mount_opts.This patch add a function
jffs2_update_mount_optsto fix this problem.By the way, I notice that tmpfs use the same way to update remounting options. If it is necessary to unify them?
Signed-off-by lizhe <[email protected]>---
fs/jffs2/super.c| 17 +++++++++++++++++1 file changed, 17 insertions(+)fs/jffs2/super.c +17
-0@@ -215,11 +215,28 @@ static int jffs2_parse_param(struct fs_context *fc, struct fs_parameter *param)return 0 ; } +static inline void jffs2_update_mount_opts (struct fs_context *fc) +{ +struct jffs2_sb_info *new_c = fc->s_fs_info; +struct jffs2_sb_info *c =JFFS2_SB_INFO (fc->root->d_sb); + +mutex_lock (&c->alloc_sem); +if (new_c->mount_opts.override_compr) { + 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) + c->mount_opts.rp_size = new_c->mount_opts.rp_size; +mutex_unlock (&c->alloc_sem); +} +static int jffs2_reconfigure (struct fs_context *fc) {struct super_block *sb = fc->root->d_sb;sync_filesystem (sb); +jffs2_update_mount_opts (fc); +return jffs2_do_remount_fs (sb, fc); }Signature · 1 line
2.12.3
Quoted 8 lines · Zhe Li
From: lizhe <[email protected]>
The jffs2 mount options will be ignored when remounting jffs2. It can be easily reproduced with the steps listed below.
1. mount -t jffs2 -o compr=none/dev/mtdblockx/mnt
2. mount -o remount compr=zlib /mnt
Quoted 6 lines
Since
ec10a24f10c8, the option parsing happens beforefill_superand then pass fc, which contains the options parsing results, to functionjffs2_reconfigureduring remounting. But functionjffs2_reconfiguredo not updatec->mount_opts.This patch add a function
jffs2_update_mount_optsto fix this problem.
Oh, a regression. Thanks for fixing.
Quoted 2 lines
By the way, I notice that tmpfs use the same way to update remounting options. If it is necessary to unify them?
If possible, sure. Maybe you can find a way to put the logic into fs/libfs.c
Signature · 2 lines
Thanks, //richard