Commit 6db1df41 authored by Calvin Owens's avatar Calvin Owens Committed by David Sterba
Browse files

btrfs: accept and ignore compression level for lzo 



The compression level is meaningless for lzo, but before commit
3f093ccb ("btrfs: harden parsing of compression mount options"),
it was silently ignored if passed.

After that commit, passing a level with lzo fails to mount:

    BTRFS error: unrecognized compression value lzo:1

It seems reasonable for users to expect that lzo would permit a numeric
level option, as all the other algos do, even though the kernel's
implementation of LZO currently only supports a single level. Because it
has always worked to pass a level, it seems likely to me that users in
the real world are relying on doing so.

This patch restores the old behavior, giving "lzo:N" the same semantics
as all of the other compression algos.

To be clear, silly variants like "lzo:one", "lzo:the_first_option", or
"lzo:armageddon" also used to work. This isn't meant to suggest that
any possible mis-interpretation of mount options that once worked must
continue to work forever. This is an exceptional case where it makes
sense to preserve compatibility, both because the mis-interpretation is
reasonable, and because nothing tangible is sacrificed.

Finally update btrfs_show_options() to ignore the level of LZO, as it
is only the default level without any extra meaning.

Fixes: 3f093ccb ("btrfs: harden parsing of compression mount options")
Reviewed-by: default avatarDaniel Vacek <neelx@suse.com>
Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarCalvin Owens <calvin@wbinvd.org>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent de134cb5

fs/btrfs/super.c

+6 −3
Original line number Diff line number Diff line
@@ -299,9 +299,12 @@ static int btrfs_parse_compress(struct btrfs_fs_context *ctx, 
		btrfs_set_opt(ctx->mount_opt, COMPRESS);

		btrfs_clear_opt(ctx->mount_opt, NODATACOW);

		btrfs_clear_opt(ctx->mount_opt, NODATASUM);

	} else if (btrfs_match_compress_type(string, "lzo", false)) {

	} else if (btrfs_match_compress_type(string, "lzo", true)) {

		ctx->compress_type = BTRFS_COMPRESS_LZO;

		ctx->compress_level = 0;

		ctx->compress_level = btrfs_compress_str2level(BTRFS_COMPRESS_LZO,

							       string + 3);

		if (string[3] == ':' && string[4])

			btrfs_warn(NULL, "Compression level ignored for LZO");

		btrfs_set_opt(ctx->mount_opt, COMPRESS);

		btrfs_clear_opt(ctx->mount_opt, NODATACOW);

		btrfs_clear_opt(ctx->mount_opt, NODATASUM);
@@ -1079,7 +1082,7 @@ static int btrfs_show_options(struct seq_file *seq, struct dentry *dentry) 
			seq_printf(seq, ",compress-force=%s", compress_type);

		else

			seq_printf(seq, ",compress=%s", compress_type);

		if (info->compress_level)

		if (info->compress_level && info->compress_type != BTRFS_COMPRESS_LZO)

			seq_printf(seq, ":%d", info->compress_level);

	}

	if (btrfs_test_opt(info, NOSSD))