mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-29 05:44:11 +00:00
Code Issues Releases Wiki Activity

mm/filemap: restructure filemap_get_pages

Browse source 
Remove the got_pages label, remove indentation, rename find_page to retry,
simplify error handling.

Link: https://lkml.kernel.org/r/20210122160140.223228-16-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Kent Overstreet <kent.overstreet@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Cc: Miaohe Lin <linmiaohe@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Matthew Wilcox (Oracle) 2021-02-24 12:02:35 -08:00 committed by Linus Torvalds
parent 5963fe0316
commit 2642fca647
1 changed files with 28 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
mm/filemap.c
View file

@ -2349,70 +2349,55 @@ static int filemap_get_pages(struct kiocb *iocb, struct iov_iter *iter,
struct file_ra_state *ra = &filp->f_ra; struct file_ra_state *ra = &filp->f_ra;
pgoff_t index = iocb->ki_pos >> PAGE_SHIFT; pgoff_t index = iocb->ki_pos >> PAGE_SHIFT;
pgoff_t last_index; pgoff_t last_index;
struct page *page;
int err = 0; int err = 0;
last_index = DIV_ROUND_UP(iocb->ki_pos + iter->count, PAGE_SIZE); last_index = DIV_ROUND_UP(iocb->ki_pos + iter->count, PAGE_SIZE);
find_page: retry:
if (fatal_signal_pending(current)) if (fatal_signal_pending(current))
return -EINTR; return -EINTR;
filemap_get_read_batch(mapping, index, last_index, pvec); filemap_get_read_batch(mapping, index, last_index, pvec);
if (pvec->nr) if (!pagevec_count(pvec)) {
goto got_pages;
if (iocb->ki_flags & IOCB_NOIO) if (iocb->ki_flags & IOCB_NOIO)
return -EAGAIN; return -EAGAIN;
page_cache_sync_readahead(mapping, ra, filp, index,
page_cache_sync_readahead(mapping, ra, filp, index, last_index - index); last_index - index);
filemap_get_read_batch(mapping, index, last_index, pvec); filemap_get_read_batch(mapping, index, last_index, pvec);
}
if (!pagevec_count(pvec)) { if (!pagevec_count(pvec)) {
if (iocb->ki_flags & (IOCB_NOWAIT | IOCB_WAITQ)) if (iocb->ki_flags & (IOCB_NOWAIT | IOCB_WAITQ))
return -EAGAIN; return -EAGAIN;
err = filemap_create_page(filp, mapping, err = filemap_create_page(filp, mapping,
iocb->ki_pos >> PAGE_SHIFT, pvec); iocb->ki_pos >> PAGE_SHIFT, pvec);
if (err == AOP_TRUNCATED_PAGE) if (err == AOP_TRUNCATED_PAGE)
goto find_page; goto retry;
return err; return err;
} }
got_pages:
{
struct page *page = pvec->pages[pvec->nr - 1];
page = pvec->pages[pagevec_count(pvec) - 1];
if (PageReadahead(page)) { if (PageReadahead(page)) {
err = filemap_readahead(iocb, filp, mapping, page, err = filemap_readahead(iocb, filp, mapping, page, last_index);
last_index); if (err)
if (err) {
put_page(page);
pvec->nr--;
goto err; goto err;
} }
}
if (!PageUptodate(page)) { if (!PageUptodate(page)) {
if ((iocb->ki_flags & IOCB_WAITQ) && if ((iocb->ki_flags & IOCB_WAITQ) && pagevec_count(pvec) > 1)
pagevec_count(pvec) > 1)
iocb->ki_flags |= IOCB_NOWAIT; iocb->ki_flags |= IOCB_NOWAIT;
err = filemap_update_page(iocb, mapping, iter, page); err = filemap_update_page(iocb, mapping, iter, page);
if (err) { if (err)
if (err < 0) goto err;
put_page(page);
pvec->nr--;
}
}
} }
return 0;
err: err:
if (likely(pvec->nr)) if (err < 0)
put_page(page);
if (likely(--pvec->nr))
return 0; return 0;
if (err == AOP_TRUNCATED_PAGE) if (err == AOP_TRUNCATED_PAGE)
goto find_page; goto retry;
if (err)
return err; return err;
/*
* No pages and no error means we raced and should retry:
*/
goto find_page;
} }
/** /**