From: Gao Xiang <hsiangkao@redhat.com>
To: linux-erofs@lists.ozlabs.org, Chao Yu <yuchao0@huawei.com>
Cc: LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 2/4] erofs: fold in should_decompress_synchronously()
Date: Fri, 18 Sep 2020 21:54:34 +0800 [thread overview]
Message-ID: <20200918135436.17689-2-hsiangkao@redhat.com> (raw)
In-Reply-To: <20200918135436.17689-1-hsiangkao@redhat.com>
should_decompress_synchronously() has one single condition
for now, so fold it instead.
Signed-off-by: Gao Xiang <hsiangkao@redhat.com>
---
fs/erofs/zdata.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c
index df6fa691097f..d483e9fee41c 100644
--- a/fs/erofs/zdata.c
+++ b/fs/erofs/zdata.c
@@ -1297,24 +1297,18 @@ static int z_erofs_readpage(struct file *file, struct page *page)
return err;
}
-static bool should_decompress_synchronously(struct erofs_sb_info *sbi,
- unsigned int nr)
-{
- return nr <= sbi->ctx.max_sync_decompress_pages;
-}
-
static void z_erofs_readahead(struct readahead_control *rac)
{
struct inode *const inode = rac->mapping->host;
struct erofs_sb_info *const sbi = EROFS_I_SB(inode);
- bool sync = should_decompress_synchronously(sbi, readahead_count(rac));
+ unsigned int nr_pages = readahead_count(rac);
+ bool sync = (nr_pages <= sbi->ctx.max_sync_decompress_pages);
struct z_erofs_decompress_frontend f = DECOMPRESS_FRONTEND_INIT(inode);
struct page *page, *head = NULL;
LIST_HEAD(pagepool);
- trace_erofs_readpages(inode, readahead_index(rac),
- readahead_count(rac), false);
+ trace_erofs_readpages(inode, readahead_index(rac), nr_pages, false);
f.headoffset = readahead_pos(rac);
--
2.18.1
next prev parent reply other threads:[~2020-09-18 13:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-18 13:54 [PATCH 1/4] erofs: avoid unnecessary variable `err' Gao Xiang
2020-09-18 13:54 ` Gao Xiang [this message]
2020-09-19 6:12 ` [PATCH 2/4] erofs: fold in should_decompress_synchronously() Chao Yu
2020-09-18 13:54 ` [PATCH 3/4] erofs: specify accurate nr_iovecs for compressed bios Gao Xiang
2020-09-19 4:50 ` Gao Xiang
2020-09-18 13:54 ` [PATCH 4/4] erofs: add REQ_RAHEAD flag to readahead requests Gao Xiang
2020-09-19 6:20 ` Chao Yu
2020-09-19 6:12 ` [PATCH 1/4] erofs: avoid unnecessary variable `err' Chao Yu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200918135436.17689-2-hsiangkao@redhat.com \
--to=hsiangkao@redhat.com \
--cc=linux-erofs@lists.ozlabs.org \
--cc=linux-kernel@vger.kernel.org \
--cc=yuchao0@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).