From: Chao Yu Date: Mon, 15 Sep 2014 10:04:44 +0000 (+0800) Subject: f2fs: fix to clean previous mount option when remount_fs X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=26666c8a4366debae30ae37d0688b2bec92d196a;p=linux-beck.git f2fs: fix to clean previous mount option when remount_fs In manual of mount, we descript remount as below: "mount -o remount,rw /dev/foo /dir After this call all old mount options are replaced and arbitrary stuff from fstab is ignored, except the loop= option which is internally generated and maintained by the mount command." Previously f2fs do not clear up old mount options when remount_fs, so we have no chance of disabling previous option (e.g. flush_merge). Fix it. Signed-off-by: Chao Yu Signed-off-by: Jaegeuk Kim --- diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 3dfa1b5eae2f..7a91a381dced 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -618,6 +618,9 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data) org_mount_opt = sbi->mount_opt; active_logs = sbi->active_logs; + sbi->mount_opt.opt = 0; + sbi->active_logs = NR_CURSEG_TYPE; + /* parse mount options */ err = parse_options(sb, data); if (err)