p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mm/filemap: don't call ->readpage if IOCB_WAITQ is set 

The readpage operation can block in many (most?) filesystems, so we should
punt to a work queue instead of calling it.  This was the last caller of
lock_page_for_iocb(), so remove it.

Link: https://lkml.kernel.org/r/20210122160140.223228-9-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:12 -08:00 committed by Linus Torvalds
parent f32b5dd721
commit 33a0f5c6b3
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mm/filemap.c
View File

@ -2154,16 +2154,6 @@ static void shrink_readahead_size_eio(struct file_ra_state *ra)
ra->ra_pages /= 4; ra->ra_pages /= 4;
} }
static int lock_page_for_iocb(struct kiocb *iocb, struct page *page)
{
if (iocb->ki_flags & IOCB_WAITQ)
return lock_page_async(page, iocb->ki_waitq);
else if (iocb->ki_flags & IOCB_NOWAIT)
return trylock_page(page) ? 0 : -EAGAIN;
else
return lock_page_killable(page);
}
/* /*
* filemap_get_read_batch - Get a batch of pages for read * filemap_get_read_batch - Get a batch of pages for read
* *
@ -2215,7 +2205,7 @@ static struct page *filemap_read_page(struct kiocb *iocb, struct file *filp,
struct file_ra_state *ra = &filp->f_ra; struct file_ra_state *ra = &filp->f_ra;
int error; int error;
if (iocb->ki_flags & (IOCB_NOIO | IOCB_NOWAIT)) { if (iocb->ki_flags & (IOCB_NOIO | IOCB_NOWAIT | IOCB_WAITQ)) {
unlock_page(page); unlock_page(page);
put_page(page); put_page(page);
return ERR_PTR(-EAGAIN); return ERR_PTR(-EAGAIN);
@ -2236,7 +2226,7 @@ static struct page *filemap_read_page(struct kiocb *iocb, struct file *filp,
} }
if (!PageUptodate(page)) { if (!PageUptodate(page)) {
error = lock_page_for_iocb(iocb, page); error = lock_page_killable(page);
if (unlikely(error)) { if (unlikely(error)) {
put_page(page); put_page(page);
return ERR_PTR(error); return ERR_PTR(error);