erofs: fold in should_decompress_synchronously()

should_decompress_synchronously() has one single condition
for now, so fold it instead.

Reviewed-by: Chao Yu <yuchao0@huawei.com>
Link: https://lore.kernel.org/r/20200919072730.24989-2-hsiangkao@redhat.com
Signed-off-by: Gao Xiang <hsiangkao@redhat.com>

diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c
index e43684b..bee6ce7 100644 (file)
--- a/fs/erofs/zdata.c
+++ b/fs/erofs/zdata.c
@@ -1294,24 +1294,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);