diff options
| author | David Sterba <dsterba@suse.com> | 2017-07-21 19:15:54 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-07-21 19:15:54 +0200 |
| commit | e2fc071fc898298ae61ff91f6eed695c9b180c05 (patch) | |
| tree | f3e113b58498f785f5369d124d696b1fb44c9e4c /fs | |
| parent | 377b1915d14391e0e01d09c6243cfe6d06158619 (diff) | |
| parent | f86d7681e99b72d06baf52fafbdb3052de2baf0e (diff) | |
Merge branch 'dev/comp-level-prep' into compression
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/props.c | 4 | ||||
| -rw-r--r-- | fs/btrfs/super.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/props.c b/fs/btrfs/props.c index 4b23ae5d0e5c..f41654f05719 100644 --- a/fs/btrfs/props.c +++ b/fs/btrfs/props.c @@ -408,9 +408,9 @@ static int prop_compression_apply(struct inode *inode, return 0; } - if (!strncmp("lzo", value, len)) + if (!strncmp("lzo", value, 3)) type = BTRFS_COMPRESS_LZO; - else if (!strncmp("zlib", value, len)) + else if (!strncmp("zlib", value, 4)) type = BTRFS_COMPRESS_ZLIB; else return -EINVAL; diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 1630f20b14f9..2c6942bfb1ad 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -498,14 +498,14 @@ int btrfs_parse_options(struct btrfs_fs_info *info, char *options, btrfs_test_opt(info, FORCE_COMPRESS); if (token == Opt_compress || token == Opt_compress_force || - strcmp(args[0].from, "zlib") == 0) { + strncmp(args[0].from, "zlib", 4) == 0) { compress_type = "zlib"; info->compress_type = BTRFS_COMPRESS_ZLIB; btrfs_set_opt(info->mount_opt, COMPRESS); btrfs_clear_opt(info->mount_opt, NODATACOW); btrfs_clear_opt(info->mount_opt, NODATASUM); no_compress = 0; - } else if (strcmp(args[0].from, "lzo") == 0) { + } else if (strncmp(args[0].from, "lzo", 3) == 0) { compress_type = "lzo"; info->compress_type = BTRFS_COMPRESS_LZO; btrfs_set_opt(info->mount_opt, COMPRESS); |