btrfs: compression: inline put_workspace

Similar to get_workspace, majority of the callbacks is trivial, we don't
gain anything by the indirection, so replace them by a switch function.
Trivial callback implementations use 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 de9b06574f4267abd9a104276c05913d4b73bbdc..9b9638557e19391ee2d630d140ac7e2132f97300 100644 (file)
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -39,7 +39,6 @@ int zlib_decompress(struct list_head *ws, unsigned char *data_in,
 struct list_head *zlib_alloc_workspace(unsigned int level);
 void zlib_free_workspace(struct list_head *ws);
 struct list_head *zlib_get_workspace(unsigned int level);
-void zlib_put_workspace(struct list_head *ws);
 
 int lzo_compress_pages(struct list_head *ws, struct address_space *mapping,
                u64 start, struct page **pages, unsigned long *out_pages,
@@ -50,7 +49,6 @@ int lzo_decompress(struct list_head *ws, unsigned char *data_in,
                size_t destlen);
 struct list_head *lzo_alloc_workspace(unsigned int level);
 void lzo_free_workspace(struct list_head *ws);
-void lzo_put_workspace(struct list_head *ws);
 
 int zstd_compress_pages(struct list_head *ws, struct address_space *mapping,
                u64 start, struct page **pages, unsigned long *out_pages,
@@ -873,11 +871,6 @@ struct heuristic_ws {
 
 static struct workspace_manager heuristic_wsm;
 
-static void heuristic_put_workspace(struct list_head *ws)
-{
-       btrfs_put_workspace(&heuristic_wsm, ws);
-}
-
 static void free_heuristic_ws(struct list_head *ws)
 {
        struct heuristic_ws *workspace;
@@ -919,7 +912,6 @@ fail:
 
 const struct btrfs_compress_op btrfs_heuristic_compress = {
        .workspace_manager = &heuristic_wsm,
-       .put_workspace = heuristic_put_workspace,
        .alloc_workspace = alloc_heuristic_ws,
        .free_workspace = free_heuristic_ws,
 };
@@ -1112,7 +1104,21 @@ wake:
 
 static void put_workspace(int type, struct list_head *ws)
 {
-       return btrfs_compress_op[type]->put_workspace(ws);
+       struct workspace_manager *wsm;
+
+       wsm = btrfs_compress_op[type]->workspace_manager;
+       switch (type) {
+       case BTRFS_COMPRESS_NONE: return btrfs_put_workspace(wsm, ws);
+       case BTRFS_COMPRESS_ZLIB: return btrfs_put_workspace(wsm, ws);
+       case BTRFS_COMPRESS_LZO:  return btrfs_put_workspace(wsm, ws);
+       case BTRFS_COMPRESS_ZSTD: return zstd_put_workspace(ws);
+       default:
+               /*
+                * This can't happen, the type is validated several times
+                * before we get here.
+                */
+               BUG();
+       }
 }
 
 /*

diff --git a/fs/btrfs/compression.h b/fs/btrfs/compression.h
index df7274c1a5d8914cf9bdfdbc332ef14b21bd6343..b8ed97fc6db4915f738930edbcf485e5b590c69c 100644 (file)
--- a/fs/btrfs/compression.h
+++ b/fs/btrfs/compression.h
@@ -125,8 +125,6 @@ struct list_head *btrfs_get_workspace(struct workspace_manager *wsm,
 void btrfs_put_workspace(struct workspace_manager *wsm, struct list_head *ws);
 
 struct btrfs_compress_op {
-       void (*put_workspace)(struct list_head *ws);
-
        struct list_head *(*alloc_workspace)(unsigned int level);
 
        void (*free_workspace)(struct list_head *workspace);

diff --git a/fs/btrfs/lzo.c b/fs/btrfs/lzo.c
index 821e5c137971cd4056dd2e6122144bc829b7d3d5..bbf917c5ff2d3ba8359451617f6c58b01a23a5a3 100644 (file)
--- a/fs/btrfs/lzo.c
+++ b/fs/btrfs/lzo.c
@@ -63,11 +63,6 @@ struct workspace {
 
 static struct workspace_manager wsm;
 
-void lzo_put_workspace(struct list_head *ws)
-{
-       btrfs_put_workspace(&wsm, ws);
-}
-
 void lzo_free_workspace(struct list_head *ws)
 {
        struct workspace *workspace = list_entry(ws, struct workspace, list);
@@ -489,7 +484,6 @@ out:
 
 const struct btrfs_compress_op btrfs_lzo_compress = {
        .workspace_manager      = &wsm,
-       .put_workspace          = lzo_put_workspace,
        .alloc_workspace        = lzo_alloc_workspace,
        .free_workspace         = lzo_free_workspace,
        .max_level              = 1,

diff --git a/fs/btrfs/zlib.c b/fs/btrfs/zlib.c
index 7caa468efe94e48a83c77dc7c82a392031b1940e..610765640c8e27833e536edca3630321eff5fdce 100644 (file)
--- a/fs/btrfs/zlib.c
+++ b/fs/btrfs/zlib.c
@@ -39,11 +39,6 @@ struct list_head *zlib_get_workspace(unsigned int level)
        return ws;
 }
 
-void zlib_put_workspace(struct list_head *ws)
-{
-       btrfs_put_workspace(&wsm, ws);
-}
-
 void zlib_free_workspace(struct list_head *ws)
 {
        struct workspace *workspace = list_entry(ws, struct workspace, list);
@@ -405,7 +400,6 @@ next:
 
 const struct btrfs_compress_op btrfs_zlib_compress = {
        .workspace_manager      = &wsm,
-       .put_workspace          = zlib_put_workspace,
        .alloc_workspace        = zlib_alloc_workspace,
        .free_workspace         = zlib_free_workspace,
        .max_level              = 9,

diff --git a/fs/btrfs/zstd.c b/fs/btrfs/zstd.c
index c9fe0e2bd1079cd5a1d78b1b3b85c5eff52a0c00..a346f1187faeb0e14cd1c181f2d6af93376787fa 100644 (file)
--- a/fs/btrfs/zstd.c
+++ b/fs/btrfs/zstd.c
@@ -708,7 +708,6 @@ finish:
 const struct btrfs_compress_op btrfs_zstd_compress = {
        /* ZSTD uses own workspace manager */
        .workspace_manager = NULL,
-       .put_workspace = zstd_put_workspace,
        .alloc_workspace = zstd_alloc_workspace,
        .free_workspace = zstd_free_workspace,
        .max_level      = ZSTD_BTRFS_MAX_LEVEL,