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>
This commit is contained in:
parent
6c3e485ea3
commit
bf9a123b9c
|
@ -1294,24 +1294,18 @@ static int z_erofs_readpage(struct file *file, struct page *page)
|
||||||
return err;
|
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)
|
static void z_erofs_readahead(struct readahead_control *rac)
|
||||||
{
|
{
|
||||||
struct inode *const inode = rac->mapping->host;
|
struct inode *const inode = rac->mapping->host;
|
||||||
struct erofs_sb_info *const sbi = EROFS_I_SB(inode);
|
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 z_erofs_decompress_frontend f = DECOMPRESS_FRONTEND_INIT(inode);
|
||||||
struct page *page, *head = NULL;
|
struct page *page, *head = NULL;
|
||||||
LIST_HEAD(pagepool);
|
LIST_HEAD(pagepool);
|
||||||
|
|
||||||
trace_erofs_readpages(inode, readahead_index(rac),
|
trace_erofs_readpages(inode, readahead_index(rac), nr_pages, false);
|
||||||
readahead_count(rac), false);
|
|
||||||
|
|
||||||
f.headoffset = readahead_pos(rac);
|
f.headoffset = readahead_pos(rac);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue