korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-24 12:44:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

btrfs: add and use readahead_batch_length

Browse Source 
Implement readahead_batch_length() to determine the number of bytes in
the current batch of readahead pages and use it in btrfs. Also use the
readahead_pos to get the offset.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Matthew Wilcox (Oracle) 2021-03-21 21:03:11 +00:00 committed by David Sterba
parent 183ebab766
commit 32c0a6bcaa
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/btrfs/extent_io.c
View File

@ -4650,10 +4650,8 @@ void extent_readahead(struct readahead_control *rac)
int nr; int nr;
while ((nr = readahead_page_batch(rac, pagepool))) { while ((nr = readahead_page_batch(rac, pagepool))) {
u64 contig_start = page_offset(pagepool[0]); u64 contig_start = readahead_pos(rac);
u64 contig_end = page_offset(pagepool[nr - 1]) + PAGE_SIZE - 1; u64 contig_end = contig_start + readahead_batch_length(rac) - 1;
ASSERT(contig_start + nr * PAGE_SIZE - 1 == contig_end);
contiguous_readpages(pagepool, nr, contig_start, contig_end, contiguous_readpages(pagepool, nr, contig_start, contig_end,
&em_cached, &bio, &bio_flags, &prev_em_start); &em_cached, &bio, &bio_flags, &prev_em_start);

9
include/linux/pagemap.h
View File

@ -981,6 +981,15 @@ static inline unsigned int readahead_count(struct readahead_control *rac)
return rac->_nr_pages; return rac->_nr_pages;
} }
/**
* readahead_batch_length - The number of bytes in the current batch.
* @rac: The readahead request.
*/
static inline loff_t readahead_batch_length(struct readahead_control *rac)
{
return rac->_batch_count * PAGE_SIZE;
}
static inline unsigned long dir_pages(struct inode *inode) static inline unsigned long dir_pages(struct inode *inode)
{ {
return (unsigned long)(inode->i_size + PAGE_SIZE - 1) >> return (unsigned long)(inode->i_size + PAGE_SIZE - 1) >>