btrfs: compression: let workspace manager cleanup take only the type

With the access to the workspace structures, we can look it up together
with the compression ops inside the workspace manager cleanup 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 61b9cf095ee501d5a06c849ac0ebf398d6bccca1..6c4dc62b9ab0c2600a6957a444e6744cc770234d 100644 (file)
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -863,7 +863,7 @@ static struct workspace_manager heuristic_wsm;
 
 static void heuristic_cleanup_workspace_manager(void)
 {
-       btrfs_cleanup_workspace_manager(&heuristic_wsm);
+       btrfs_cleanup_workspace_manager(BTRFS_COMPRESS_NONE);
 }
 
 static struct list_head *heuristic_get_workspace(unsigned int level)
@@ -960,10 +960,12 @@ static void btrfs_init_workspace_manager(int type)
        }
 }
 
-void btrfs_cleanup_workspace_manager(struct workspace_manager *wsman)
+void btrfs_cleanup_workspace_manager(int type)
 {
+       struct workspace_manager *wsman;
        struct list_head *ws;
 
+       wsman = btrfs_compress_op[type]->workspace_manager;
        while (!list_empty(&wsman->idle_ws)) {
                ws = wsman->idle_ws.next;
                list_del(ws);

diff --git a/fs/btrfs/compression.h b/fs/btrfs/compression.h
index 12a46139c3896e82620fbf70a75811301231237d..0deaa8e03836de610901aacc4f206c442676e79d 100644 (file)
--- a/fs/btrfs/compression.h
+++ b/fs/btrfs/compression.h
@@ -123,7 +123,7 @@ struct workspace_manager {
 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);
+void btrfs_cleanup_workspace_manager(int type);
 
 struct btrfs_compress_op {
        void (*cleanup_workspace_manager)(void);

diff --git a/fs/btrfs/lzo.c b/fs/btrfs/lzo.c
index a55079477edf9dbef9d738bf857c04b5c14c7848..6aa602040506f6e94b4ab3aaff3d97d7f050d405 100644 (file)
--- a/fs/btrfs/lzo.c
+++ b/fs/btrfs/lzo.c
@@ -65,7 +65,7 @@ static struct workspace_manager wsm;
 
 static void lzo_cleanup_workspace_manager(void)
 {
-       btrfs_cleanup_workspace_manager(&wsm);
+       btrfs_cleanup_workspace_manager(BTRFS_COMPRESS_LZO);
 }
 
 static struct list_head *lzo_get_workspace(unsigned int level)

diff --git a/fs/btrfs/zlib.c b/fs/btrfs/zlib.c
index 39f1d0f1b286429fa8e87c2b65441de87c896dbb..7319e9f3d484ef1b0d81dd025d9c1eae9a06c877 100644 (file)
--- a/fs/btrfs/zlib.c
+++ b/fs/btrfs/zlib.c
@@ -31,7 +31,7 @@ static struct workspace_manager wsm;
 
 static void zlib_cleanup_workspace_manager(void)
 {
-       btrfs_cleanup_workspace_manager(&wsm);
+       btrfs_cleanup_workspace_manager(BTRFS_COMPRESS_ZLIB);
 }
 
 static struct list_head *zlib_get_workspace(unsigned int level)