btrfs: compression: pass type to btrfs_get_workspace

We can infer the workspace_manager from type and the type will be used
in the following patch to call a common helper for alloc_workspace.

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 9b9638557e19391ee2d630d140ac7e2132f97300..ffc94e15d86e8a64a99a84def6a566b57db9430f 100644 (file)
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -972,9 +972,9 @@ static void btrfs_cleanup_workspace_manager(int type)
  * Preallocation makes a forward progress guarantees and we do not return
  * errors.
  */
-struct list_head *btrfs_get_workspace(struct workspace_manager *wsm,
-                                     unsigned int level)
+struct list_head *btrfs_get_workspace(int type, unsigned int level)
 {
+       struct workspace_manager *wsm;
        struct list_head *workspace;
        int cpus = num_online_cpus();
        unsigned nofs_flag;
@@ -984,6 +984,7 @@ struct list_head *btrfs_get_workspace(struct workspace_manager *wsm,
        wait_queue_head_t *ws_wait;
        int *free_ws;
 
+       wsm = btrfs_compress_op[type]->workspace_manager;
        idle_ws  = &wsm->idle_ws;
        ws_lock  = &wsm->ws_lock;
        total_ws = &wsm->total_ws;
@@ -1052,13 +1053,10 @@ again:
 
 static struct list_head *get_workspace(int type, int level)
 {
-       struct workspace_manager *wsm;
-
-       wsm = btrfs_compress_op[type]->workspace_manager;
        switch (type) {
-       case BTRFS_COMPRESS_NONE: return btrfs_get_workspace(wsm, level);
+       case BTRFS_COMPRESS_NONE: return btrfs_get_workspace(type, level);
        case BTRFS_COMPRESS_ZLIB: return zlib_get_workspace(level);
-       case BTRFS_COMPRESS_LZO:  return btrfs_get_workspace(wsm, level);
+       case BTRFS_COMPRESS_LZO:  return btrfs_get_workspace(type, level);
        case BTRFS_COMPRESS_ZSTD: return zstd_get_workspace(level);
        default:
                /*

diff --git a/fs/btrfs/compression.h b/fs/btrfs/compression.h
index b8ed97fc6db4915f738930edbcf485e5b590c69c..accb1d61df8747277b35831b2544ce6e9ce4e02a 100644 (file)
--- a/fs/btrfs/compression.h
+++ b/fs/btrfs/compression.h
@@ -120,8 +120,7 @@ struct workspace_manager {
        wait_queue_head_t ws_wait;
 };
 
-struct list_head *btrfs_get_workspace(struct workspace_manager *wsm,
-                                     unsigned int level);
+struct list_head *btrfs_get_workspace(int type, unsigned int level);
 void btrfs_put_workspace(struct workspace_manager *wsm, struct list_head *ws);
 
 struct btrfs_compress_op {

diff --git a/fs/btrfs/zlib.c b/fs/btrfs/zlib.c
index 610765640c8e27833e536edca3630321eff5fdce..5679a2e41a528ffd48db35c6fe195655318e0206 100644 (file)
--- a/fs/btrfs/zlib.c
+++ b/fs/btrfs/zlib.c
@@ -31,7 +31,7 @@ static struct workspace_manager wsm;
 
 struct list_head *zlib_get_workspace(unsigned int level)
 {
-       struct list_head *ws = btrfs_get_workspace(&wsm, level);
+       struct list_head *ws = btrfs_get_workspace(BTRFS_COMPRESS_ZLIB, level);
        struct workspace *workspace = list_entry(ws, struct workspace, list);
 
        workspace->level = level;