summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2019-08-09 10:25:34 -0400
committerDavid Sterba <dsterba@suse.com>2019-09-09 08:59:11 -0400
commite18333a7cb97d838c09802092fcecd3269363ecb (patch)
tree891fcb04e1cd69b5a23529a5029df99b3ff5b4d6
parentefad8a853ad2057f96664328a0d327a05ce39c76 (diff)
btrfs: define compression levels statically
The maximum and default levels do not change and can be defined directly. The set_level callback was a temporary solution and will be removed. Reviewed-by: Nikolay Borisov <nborisov@suse.com> Reviewed-by: Anand Jain <anand.jain@oracle.com> Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r--fs/btrfs/compression.h4
-rw-r--r--fs/btrfs/lzo.c2
-rw-r--r--fs/btrfs/zlib.c2
-rw-r--r--fs/btrfs/zstd.c2
4 files changed, 10 insertions, 0 deletions
diff --git a/fs/btrfs/compression.h b/fs/btrfs/compression.h
index 2035b8eb1290..cffd689adb6e 100644
--- a/fs/btrfs/compression.h
+++ b/fs/btrfs/compression.h
@@ -162,6 +162,10 @@ struct btrfs_compress_op {
162 * if the level is out of bounds or the default if 0 is passed in. 162 * if the level is out of bounds or the default if 0 is passed in.
163 */ 163 */
164 unsigned int (*set_level)(unsigned int level); 164 unsigned int (*set_level)(unsigned int level);
165
166 /* Maximum level supported by the compression algorithm */
167 unsigned int max_level;
168 unsigned int default_level;
165}; 169};
166 170
167/* The heuristic workspaces are managed via the 0th workspace manager */ 171/* The heuristic workspaces are managed via the 0th workspace manager */
diff --git a/fs/btrfs/lzo.c b/fs/btrfs/lzo.c
index 579d53ae256f..adac6cb30d65 100644
--- a/fs/btrfs/lzo.c
+++ b/fs/btrfs/lzo.c
@@ -523,4 +523,6 @@ const struct btrfs_compress_op btrfs_lzo_compress = {
523 .decompress_bio = lzo_decompress_bio, 523 .decompress_bio = lzo_decompress_bio,
524 .decompress = lzo_decompress, 524 .decompress = lzo_decompress,
525 .set_level = lzo_set_level, 525 .set_level = lzo_set_level,
526 .max_level = 1,
527 .default_level = 1,
526}; 528};
diff --git a/fs/btrfs/zlib.c b/fs/btrfs/zlib.c
index b86b7ad6b900..03d6c3683bd9 100644
--- a/fs/btrfs/zlib.c
+++ b/fs/btrfs/zlib.c
@@ -437,4 +437,6 @@ const struct btrfs_compress_op btrfs_zlib_compress = {
437 .decompress_bio = zlib_decompress_bio, 437 .decompress_bio = zlib_decompress_bio,
438 .decompress = zlib_decompress, 438 .decompress = zlib_decompress,
439 .set_level = zlib_set_level, 439 .set_level = zlib_set_level,
440 .max_level = 9,
441 .default_level = BTRFS_ZLIB_DEFAULT_LEVEL,
440}; 442};
diff --git a/fs/btrfs/zstd.c b/fs/btrfs/zstd.c
index 3837ca180d52..b2b23a6a497d 100644
--- a/fs/btrfs/zstd.c
+++ b/fs/btrfs/zstd.c
@@ -729,4 +729,6 @@ const struct btrfs_compress_op btrfs_zstd_compress = {
729 .decompress_bio = zstd_decompress_bio, 729 .decompress_bio = zstd_decompress_bio,
730 .decompress = zstd_decompress, 730 .decompress = zstd_decompress,
731 .set_level = zstd_set_level, 731 .set_level = zstd_set_level,
732 .max_level = ZSTD_BTRFS_MAX_LEVEL,
733 .default_level = ZSTD_BTRFS_DEFAULT_LEVEL,
732}; 734};