btrfs: compression: inline init_workspace_manager

Replace loop calling to all algos with a list of direct calls to the
init manager callback. When that becomes trivial it is replaced by
direct call to the helper.

Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index 6adc7f6..61b9cf0 100644 (file)
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -52,6 +52,7 @@ int zstd_decompress_bio(struct list_head *ws, struct compressed_bio *cb);
 int zstd_decompress(struct list_head *ws, unsigned char *data_in,
                struct page *dest_page, unsigned long start_byte, size_t srclen,
                size_t destlen);
+void zstd_init_workspace_manager(void);
 
 static const char* const btrfs_compress_types[] = { "", "zlib", "lzo", "zstd" };
 
@@ -860,11 +861,6 @@ struct heuristic_ws {
 
 static struct workspace_manager heuristic_wsm;
 
-static void heuristic_init_workspace_manager(void)
-{
-       btrfs_init_workspace_manager(BTRFS_COMPRESS_NONE);
-}
-
 static void heuristic_cleanup_workspace_manager(void)
 {
        btrfs_cleanup_workspace_manager(&heuristic_wsm);
@@ -921,7 +917,6 @@ fail:
 
 const struct btrfs_compress_op btrfs_heuristic_compress = {
        .workspace_manager = &heuristic_wsm,
-       .init_workspace_manager = heuristic_init_workspace_manager,
        .cleanup_workspace_manager = heuristic_cleanup_workspace_manager,
        .get_workspace = heuristic_get_workspace,
        .put_workspace = heuristic_put_workspace,
@@ -937,7 +932,7 @@ static const struct btrfs_compress_op * const btrfs_compress_op[] = {
        &btrfs_zstd_compress,
 };
 
-void btrfs_init_workspace_manager(int type)
+static void btrfs_init_workspace_manager(int type)
 {
        const struct btrfs_compress_op *ops = btrfs_compress_op[type];
        struct workspace_manager *wsm = ops->workspace_manager;
@@ -1194,10 +1189,10 @@ int btrfs_decompress(int type, unsigned char *data_in, struct page *dest_page,
 
 void __init btrfs_init_compress(void)
 {
-       int i;
-
-       for (i = 0; i < BTRFS_NR_WORKSPACE_MANAGERS; i++)
-               btrfs_compress_op[i]->init_workspace_manager();
+       btrfs_init_workspace_manager(BTRFS_COMPRESS_NONE);
+       btrfs_init_workspace_manager(BTRFS_COMPRESS_ZLIB);
+       btrfs_init_workspace_manager(BTRFS_COMPRESS_LZO);
+       zstd_init_workspace_manager();
 }
 
 void __cold btrfs_exit_compress(void)

diff --git a/fs/btrfs/compression.h b/fs/btrfs/compression.h
index 10f82e7..12a4613 100644 (file)
--- a/fs/btrfs/compression.h
+++ b/fs/btrfs/compression.h
@@ -120,15 +120,12 @@ struct workspace_manager {
        wait_queue_head_t ws_wait;
 };
 
-void btrfs_init_workspace_manager(int type);
 struct list_head *btrfs_get_workspace(struct workspace_manager *wsm,
                                      unsigned int level);
 void btrfs_put_workspace(struct workspace_manager *wsm, struct list_head *ws);
 void btrfs_cleanup_workspace_manager(struct workspace_manager *wsm);
 
 struct btrfs_compress_op {
-       void (*init_workspace_manager)(void);
-
        void (*cleanup_workspace_manager)(void);
 
        struct list_head *(*get_workspace)(unsigned int level);

diff --git a/fs/btrfs/lzo.c b/fs/btrfs/lzo.c
index 5b84700..a550794 100644 (file)
--- a/fs/btrfs/lzo.c
+++ b/fs/btrfs/lzo.c
@@ -63,11 +63,6 @@ struct workspace {
 
 static struct workspace_manager wsm;
 
-static void lzo_init_workspace_manager(void)
-{
-       btrfs_init_workspace_manager(BTRFS_COMPRESS_LZO);
-}
-
 static void lzo_cleanup_workspace_manager(void)
 {
        btrfs_cleanup_workspace_manager(&wsm);
@@ -504,7 +499,6 @@ out:
 
 const struct btrfs_compress_op btrfs_lzo_compress = {
        .workspace_manager      = &wsm,
-       .init_workspace_manager = lzo_init_workspace_manager,
        .cleanup_workspace_manager = lzo_cleanup_workspace_manager,
        .get_workspace          = lzo_get_workspace,
        .put_workspace          = lzo_put_workspace,

diff --git a/fs/btrfs/zlib.c b/fs/btrfs/zlib.c
index be96412..39f1d0f 100644 (file)
--- a/fs/btrfs/zlib.c
+++ b/fs/btrfs/zlib.c
@@ -29,11 +29,6 @@ struct workspace {
 
 static struct workspace_manager wsm;
 
-static void zlib_init_workspace_manager(void)
-{
-       btrfs_init_workspace_manager(BTRFS_COMPRESS_ZLIB);
-}
-
 static void zlib_cleanup_workspace_manager(void)
 {
        btrfs_cleanup_workspace_manager(&wsm);
@@ -415,7 +410,6 @@ next:
 
 const struct btrfs_compress_op btrfs_zlib_compress = {
        .workspace_manager      = &wsm,
-       .init_workspace_manager = zlib_init_workspace_manager,
        .cleanup_workspace_manager = zlib_cleanup_workspace_manager,
        .get_workspace          = zlib_get_workspace,
        .put_workspace          = zlib_put_workspace,

diff --git a/fs/btrfs/zstd.c b/fs/btrfs/zstd.c
index 4791e89..8e7a804 100644 (file)
--- a/fs/btrfs/zstd.c
+++ b/fs/btrfs/zstd.c
@@ -168,7 +168,7 @@ static void zstd_calc_ws_mem_sizes(void)
        }
 }
 
-static void zstd_init_workspace_manager(void)
+void zstd_init_workspace_manager(void)
 {
        struct list_head *ws;
        int i;
@@ -709,7 +709,6 @@ finish:
 const struct btrfs_compress_op btrfs_zstd_compress = {
        /* ZSTD uses own workspace manager */
        .workspace_manager = NULL,
-       .init_workspace_manager = zstd_init_workspace_manager,
        .cleanup_workspace_manager = zstd_cleanup_workspace_manager,
        .get_workspace = zstd_get_workspace,
        .put_workspace = zstd_put_workspace,