jffs2: Allow setting rp_size to zero during remounting

[sfrench/cifs-2.6.git] / fs / jffs2 / super.c

diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c
index 4fd297bdf0f3ff9bdf7c6dd03bab23eb426f5fac..c523adaca79f353155ed78bdaea96516459c83d2 100644 (file)
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
@@ -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);
 }