Skip to content

Commit 6db1df4

Browse files
jcalvinowenskdave
authored andcommitted
btrfs: accept and ignore compression level for lzo
The compression level is meaningless for lzo, but before commit 3f093cc ("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: 3f093cc ("btrfs: harden parsing of compression mount options") Reviewed-by: Daniel Vacek <[email protected]> Reviewed-by: Qu Wenruo <[email protected]> Signed-off-by: Calvin Owens <[email protected]> Reviewed-by: David Sterba <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent de134cb commit 6db1df4

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

fs/btrfs/super.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,9 +299,12 @@ static int btrfs_parse_compress(struct btrfs_fs_context *ctx,
299299
btrfs_set_opt(ctx->mount_opt, COMPRESS);
300300
btrfs_clear_opt(ctx->mount_opt, NODATACOW);
301301
btrfs_clear_opt(ctx->mount_opt, NODATASUM);
302-
} else if (btrfs_match_compress_type(string, "lzo", false)) {
302+
} else if (btrfs_match_compress_type(string, "lzo", true)) {
303303
ctx->compress_type = BTRFS_COMPRESS_LZO;
304-
ctx->compress_level = 0;
304+
ctx->compress_level = btrfs_compress_str2level(BTRFS_COMPRESS_LZO,
305+
string + 3);
306+
if (string[3] == ':' && string[4])
307+
btrfs_warn(NULL, "Compression level ignored for LZO");
305308
btrfs_set_opt(ctx->mount_opt, COMPRESS);
306309
btrfs_clear_opt(ctx->mount_opt, NODATACOW);
307310
btrfs_clear_opt(ctx->mount_opt, NODATASUM);
@@ -1079,7 +1082,7 @@ static int btrfs_show_options(struct seq_file *seq, struct dentry *dentry)
10791082
seq_printf(seq, ",compress-force=%s", compress_type);
10801083
else
10811084
seq_printf(seq, ",compress=%s", compress_type);
1082-
if (info->compress_level)
1085+
if (info->compress_level && info->compress_type != BTRFS_COMPRESS_LZO)
10831086
seq_printf(seq, ":%d", info->compress_level);
10841087
}
10851088
if (btrfs_test_opt(info, NOSSD))

0 commit comments

Comments
 (0)