mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 04:01:48 -04:00
fs: support IOCB_NOWAIT in generic_file_buffered_read
Allow generic_file_buffered_read to bail out early instead of waiting for the page lock or reading a page if IOCB_NOWAIT is specified. Signed-off-by: Milosz Tanski <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Reviewed-by: Jeff Moyer <[email protected]> Acked-by: Sage Weil <[email protected]> Signed-off-by: Al Viro <[email protected]>
This commit is contained in:
parent
47c27bc469
commit
3239d83484
1 changed files with 9 additions and 0 deletions
|
|
@ -1939,6 +1939,8 @@ find_page:
|
|||
|
||||
page = find_get_page(mapping, index);
|
||||
if (!page) {
|
||||
if (iocb->ki_flags & IOCB_NOWAIT)
|
||||
goto would_block;
|
||||
page_cache_sync_readahead(mapping,
|
||||
ra, filp,
|
||||
index, last_index - index);
|
||||
|
|
@ -1952,6 +1954,11 @@ find_page:
|
|||
index, last_index - index);
|
||||
}
|
||||
if (!PageUptodate(page)) {
|
||||
if (iocb->ki_flags & IOCB_NOWAIT) {
|
||||
put_page(page);
|
||||
goto would_block;
|
||||
}
|
||||
|
||||
/*
|
||||
* See comment in do_read_cache_page on why
|
||||
* wait_on_page_locked is used to avoid unnecessarily
|
||||
|
|
@ -2133,6 +2140,8 @@ no_cached_page:
|
|||
goto readpage;
|
||||
}
|
||||
|
||||
would_block:
|
||||
error = -EAGAIN;
|
||||
out:
|
||||
ra->prev_pos = prev_index;
|
||||
ra->prev_pos <<= PAGE_SHIFT;
|
||||
|
|
|
|||
Loading…
Reference in a new issue