mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fs: return if direct I/O will trigger writeback

Browse source 
Find out if the I/O will trigger a wait due to writeback. If yes,
return -EAGAIN.

Return -EINVAL for buffered AIO: there are multiple causes of
delay such as page locks, dirty throttling logic, page loading
from disk etc. which cannot be taken care of.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Goldwyn Rodrigues 2017-06-20 07:05:44 -05:00 committed by Jens Axboe
parent b745fafaf7
commit 6be96d3ad3
1 changed files with 25 additions and 7 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

32
mm/filemap.c
View file

@ -2070,10 +2070,17 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
loff_t size; loff_t size;
size = i_size_read(inode); size = i_size_read(inode);
retval = filemap_write_and_wait_range(mapping, iocb->ki_pos, if (iocb->ki_flags & IOCB_NOWAIT) {
iocb->ki_pos + count - 1); if (filemap_range_has_page(mapping, iocb->ki_pos,
if (retval < 0) iocb->ki_pos + count - 1))
goto out; return -EAGAIN;
} else {
retval = filemap_write_and_wait_range(mapping,
iocb->ki_pos,
iocb->ki_pos + count - 1);
if (retval < 0)
goto out;
}
file_accessed(file); file_accessed(file);
@ -2674,6 +2681,9 @@ inline ssize_t generic_write_checks(struct kiocb *iocb, struct iov_iter *from)
pos = iocb->ki_pos; pos = iocb->ki_pos;
if ((iocb->ki_flags & IOCB_NOWAIT) && !(iocb->ki_flags & IOCB_DIRECT))
return -EINVAL;
if (limit != RLIM_INFINITY) { if (limit != RLIM_INFINITY) {
if (iocb->ki_pos >= limit) { if (iocb->ki_pos >= limit) {
send_sig(SIGXFSZ, current, 0); send_sig(SIGXFSZ, current, 0);
@ -2742,9 +2752,17 @@ generic_file_direct_write(struct kiocb *iocb, struct iov_iter *from)
write_len = iov_iter_count(from); write_len = iov_iter_count(from);
end = (pos + write_len - 1) >> PAGE_SHIFT; end = (pos + write_len - 1) >> PAGE_SHIFT;
written = filemap_write_and_wait_range(mapping, pos, pos + write_len - 1); if (iocb->ki_flags & IOCB_NOWAIT) {
if (written) /* If there are pages to writeback, return */
goto out; if (filemap_range_has_page(inode->i_mapping, pos,
pos + iov_iter_count(from)))
return -EAGAIN;
} else {
written = filemap_write_and_wait_range(mapping, pos,
pos + write_len - 1);
if (written)
goto out;
}
/* /*
* After a write we want buffered reads to be sure to go to disk to get * After a write we want buffered reads to be sure to go to disk to get