|
@@ -1910,16 +1910,18 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
|
|
if (iocb->ki_flags & IOCB_DIRECT) {
|
|
if (iocb->ki_flags & IOCB_DIRECT) {
|
|
struct address_space *mapping = file->f_mapping;
|
|
struct address_space *mapping = file->f_mapping;
|
|
struct inode *inode = mapping->host;
|
|
struct inode *inode = mapping->host;
|
|
|
|
+ struct iov_iter data = *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,
|
|
retval = filemap_write_and_wait_range(mapping, iocb->ki_pos,
|
|
iocb->ki_pos + count - 1);
|
|
iocb->ki_pos + count - 1);
|
|
- if (!retval) {
|
|
|
|
- struct iov_iter data = *iter;
|
|
|
|
- retval = mapping->a_ops->direct_IO(iocb, &data);
|
|
|
|
- }
|
|
|
|
|
|
+ if (retval < 0)
|
|
|
|
+ goto out;
|
|
|
|
|
|
|
|
+ file_accessed(file);
|
|
|
|
+
|
|
|
|
+ retval = mapping->a_ops->direct_IO(iocb, &data);
|
|
if (retval > 0) {
|
|
if (retval > 0) {
|
|
iocb->ki_pos += retval;
|
|
iocb->ki_pos += retval;
|
|
iov_iter_advance(iter, retval);
|
|
iov_iter_advance(iter, retval);
|
|
@@ -1935,10 +1937,8 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
|
|
* DAX files, so don't bother trying.
|
|
* DAX files, so don't bother trying.
|
|
*/
|
|
*/
|
|
if (retval < 0 || !iov_iter_count(iter) || iocb->ki_pos >= size ||
|
|
if (retval < 0 || !iov_iter_count(iter) || iocb->ki_pos >= size ||
|
|
- IS_DAX(inode)) {
|
|
|
|
- file_accessed(file);
|
|
|
|
|
|
+ IS_DAX(inode))
|
|
goto out;
|
|
goto out;
|
|
- }
|
|
|
|
}
|
|
}
|
|
|
|
|
|
retval = do_generic_file_read(file, &iocb->ki_pos, iter, retval);
|
|
retval = do_generic_file_read(file, &iocb->ki_pos, iter, retval);
|