* [PATCH] btrfs: remove indirect function calls from zstd
@ 2019-02-27 21:21 Dennis Zhou
2019-02-28 18:43 ` David Sterba
0 siblings, 1 reply; 2+ messages in thread
From: Dennis Zhou @ 2019-02-27 21:21 UTC (permalink / raw)
To: David Sterba, Josef Bacik, Chris Mason, Omar Sandoval, Nikolay Borisov
Cc: kernel-team, linux-btrfs, linux-kernel, Dennis Zhou
While calling functions inside zstd, we don't need to use the
indirection provided by the workspace_manager. Forward declarations are
added to maintain the function order of btrfs_compress_op.
Signed-off-by: Dennis Zhou <dennis@kernel.org>
---
fs/btrfs/zstd.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/fs/btrfs/zstd.c b/fs/btrfs/zstd.c
index 6b9e29d050f3..a6ff07cf11d5 100644
--- a/fs/btrfs/zstd.c
+++ b/fs/btrfs/zstd.c
@@ -90,6 +90,9 @@ static inline struct workspace *list_to_workspace(struct list_head *list)
return container_of(list, struct workspace, list);
}
+static void zstd_free_workspace(struct list_head *ws);
+static struct list_head *zstd_alloc_workspace(unsigned int level);
+
/*
* zstd_reclaim_timer_fn - reclaim timer
* @t: timer
@@ -124,7 +127,7 @@ static void zstd_reclaim_timer_fn(struct timer_list *timer)
level = victim->level;
list_del(&victim->lru_list);
list_del(&victim->list);
- wsm.ops->free_workspace(&victim->list);
+ zstd_free_workspace(&victim->list);
if (list_empty(&wsm.idle_ws[level - 1]))
clear_bit(level - 1, &wsm.active_map);
@@ -180,7 +183,7 @@ static void zstd_init_workspace_manager(void)
for (i = 0; i < ZSTD_BTRFS_MAX_LEVEL; i++)
INIT_LIST_HEAD(&wsm.idle_ws[i]);
- ws = wsm.ops->alloc_workspace(ZSTD_BTRFS_MAX_LEVEL);
+ ws = zstd_alloc_workspace(ZSTD_BTRFS_MAX_LEVEL);
if (IS_ERR(ws)) {
pr_warn(
"BTRFS: cannot preallocate zstd compression workspace\n");
@@ -202,7 +205,7 @@ static void zstd_cleanup_workspace_manager(void)
struct workspace, list);
list_del(&workspace->list);
list_del(&workspace->lru_list);
- wsm.ops->free_workspace(&workspace->list);
+ zstd_free_workspace(&workspace->list);
}
}
spin_unlock(&wsm.lock);
@@ -272,7 +275,7 @@ static struct list_head *zstd_get_workspace(unsigned int level)
return ws;
nofs_flag = memalloc_nofs_save();
- ws = wsm.ops->alloc_workspace(level);
+ ws = zstd_alloc_workspace(level);
memalloc_nofs_restore(nofs_flag);
if (IS_ERR(ws)) {
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] btrfs: remove indirect function calls from zstd
2019-02-27 21:21 [PATCH] btrfs: remove indirect function calls from zstd Dennis Zhou
@ 2019-02-28 18:43 ` David Sterba
0 siblings, 0 replies; 2+ messages in thread
From: David Sterba @ 2019-02-28 18:43 UTC (permalink / raw)
To: Dennis Zhou
Cc: David Sterba, Josef Bacik, Chris Mason, Omar Sandoval,
Nikolay Borisov, kernel-team, linux-btrfs, linux-kernel
On Wed, Feb 27, 2019 at 04:21:28PM -0500, Dennis Zhou wrote:
> While calling functions inside zstd, we don't need to use the
> indirection provided by the workspace_manager. Forward declarations are
> added to maintain the function order of btrfs_compress_op.
>
> Signed-off-by: Dennis Zhou <dennis@kernel.org>
Reviewed-by: David Sterba <dsterba@suse.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-02-28 18:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-27 21:21 [PATCH] btrfs: remove indirect function calls from zstd Dennis Zhou
2019-02-28 18:43 ` David Sterba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).