Messages in this thread Patch in this message | | | From | Gao Xiang <> | Subject | [PATCH 1/2] erofs: fold in postsubmit_is_all_bypassed() | Date | Mon, 20 Jan 2020 16:57:08 +0800 |
| |
From: Gao Xiang <gaoxiang25@huawei.com>
No need to introduce such separated helper since cache strategy compile configs was changed into runtime options instead in v5.4. No logic changes.
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com> --- fs/erofs/zdata.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-)
diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c index 4fedeb4496e4..6ee5153801b2 100644 --- a/fs/erofs/zdata.c +++ b/fs/erofs/zdata.c @@ -1148,20 +1148,6 @@ static void move_to_bypass_jobqueue(struct z_erofs_pcluster *pcl, qtail[JQ_BYPASS] = &pcl->next; } -static bool postsubmit_is_all_bypassed(struct z_erofs_decompressqueue *q[], - unsigned int nr_bios, bool force_fg) -{ - /* - * although background is preferred, no one is pending for submission. - * don't issue workqueue for decompression but drop it directly instead. - */ - if (force_fg || nr_bios) - return false; - - kvfree(q[JQ_SUBMIT]); - return true; -} - static bool z_erofs_submit_queue(struct super_block *sb, z_erofs_next_pcluster_t owned_head, struct list_head *pagepool, @@ -1262,9 +1248,14 @@ static bool z_erofs_submit_queue(struct super_block *sb, if (bio) submit_bio(bio); - if (postsubmit_is_all_bypassed(q, nr_bios, *force_fg)) + /* + * although background is preferred, no one is pending for submission. + * don't issue workqueue for decompression but drop it directly instead. + */ + if (!force_fg && !nr_bios) { + kvfree(q[JQ_SUBMIT]); return true; - + } z_erofs_decompress_kickoff(q[JQ_SUBMIT], *force_fg, nr_bios); return true; } -- 2.20.1
| |