mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 07:38:10 +00:00
ext4: Convert pagecache_read() to use a folio
Use the folio API and support folios of arbitrary sizes. Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Link: https://lore.kernel.org/r/20230324180129.1220691-29-willy@infradead.org Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
parent
3060b6ef05
commit
b23fb76278
1 changed files with 7 additions and 9 deletions
|
@ -42,18 +42,16 @@ static int pagecache_read(struct inode *inode, void *buf, size_t count,
|
||||||
loff_t pos)
|
loff_t pos)
|
||||||
{
|
{
|
||||||
while (count) {
|
while (count) {
|
||||||
size_t n = min_t(size_t, count,
|
struct folio *folio;
|
||||||
PAGE_SIZE - offset_in_page(pos));
|
size_t n;
|
||||||
struct page *page;
|
|
||||||
|
|
||||||
page = read_mapping_page(inode->i_mapping, pos >> PAGE_SHIFT,
|
folio = read_mapping_folio(inode->i_mapping, pos >> PAGE_SHIFT,
|
||||||
NULL);
|
NULL);
|
||||||
if (IS_ERR(page))
|
if (IS_ERR(folio))
|
||||||
return PTR_ERR(page);
|
return PTR_ERR(folio);
|
||||||
|
|
||||||
memcpy_from_page(buf, page, offset_in_page(pos), n);
|
n = memcpy_from_file_folio(buf, folio, pos, count);
|
||||||
|
folio_put(folio);
|
||||||
put_page(page);
|
|
||||||
|
|
||||||
buf += n;
|
buf += n;
|
||||||
pos += n;
|
pos += n;
|
||||||
|
|
Loading…
Reference in a new issue