Commit 69c0dd29 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: ignore compress mount option on image w/o compression feature 



to keep consistent with behavior when passing compress mount option
to kernel w/o compression feature, so that mount may not fail on
such condition.

Reported-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent ca313c82

fs/f2fs/super.c

+6 −6
Original line number Diff line number Diff line
@@ -871,8 +871,8 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount) 
#ifdef CONFIG_F2FS_FS_COMPRESSION

		case Opt_compress_algorithm:

			if (!f2fs_sb_has_compression(sbi)) {

				f2fs_err(sbi, "Compression feature if off");

				return -EINVAL;

				f2fs_info(sbi, "Image doesn't support compression");

				break;

			}

			name = match_strdup(&args[0]);

			if (!name)
@@ -897,8 +897,8 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount) 
			break;

		case Opt_compress_log_size:

			if (!f2fs_sb_has_compression(sbi)) {

				f2fs_err(sbi, "Compression feature is off");

				return -EINVAL;

				f2fs_info(sbi, "Image doesn't support compression");

				break;

			}

			if (args->from && match_int(args, &arg))

				return -EINVAL;
@@ -912,8 +912,8 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount) 
			break;

		case Opt_compress_extension:

			if (!f2fs_sb_has_compression(sbi)) {

				f2fs_err(sbi, "Compression feature is off");

				return -EINVAL;

				f2fs_info(sbi, "Image doesn't support compression");

				break;

			}

			name = match_strdup(&args[0]);

			if (!name)

CRA Git | Maintained and supported by SUSTech CRA and CCSE