diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2019-11-06 00:21:09 +0300 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2019-11-06 00:21:09 +0300 |
| commit | 8d0d47ea1640b23678306c007ccc813b5b930af4 (patch) | |
| tree | 79c4be5111bb6c1cbf495ea8d98e008da46cb6c2 /fs/iomap/direct-io.c | |
| parent | a6d4040846bff49c7e870cee5693245f87f2cfce (diff) | |
| parent | 378f32bab3714f04c4e0c3aee4129f6703805550 (diff) | |
| download | linux-8d0d47ea1640b23678306c007ccc813b5b930af4.tar.xz | |
Merge branch 'mb/dio' into master
Diffstat (limited to 'fs/iomap/direct-io.c')
| -rw-r--r-- | fs/iomap/direct-io.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c index 1fc28c2da279..2f88d64c2a4d 100644 --- a/fs/iomap/direct-io.c +++ b/fs/iomap/direct-io.c @@ -358,7 +358,7 @@ iomap_dio_inline_actor(struct inode *inode, loff_t pos, loff_t length, static loff_t iomap_dio_actor(struct inode *inode, loff_t pos, loff_t length, - void *data, struct iomap *iomap) + void *data, struct iomap *iomap, struct iomap *srcmap) { struct iomap_dio *dio = data; @@ -392,7 +392,8 @@ iomap_dio_actor(struct inode *inode, loff_t pos, loff_t length, */ ssize_t iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, - const struct iomap_ops *ops, const struct iomap_dio_ops *dops) + const struct iomap_ops *ops, const struct iomap_dio_ops *dops, + bool wait_for_completion) { struct address_space *mapping = iocb->ki_filp->f_mapping; struct inode *inode = file_inode(iocb->ki_filp); @@ -400,7 +401,6 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, loff_t pos = iocb->ki_pos, start = pos; loff_t end = iocb->ki_pos + count - 1, ret = 0; unsigned int flags = IOMAP_DIRECT; - bool wait_for_completion = is_sync_kiocb(iocb); struct blk_plug plug; struct iomap_dio *dio; @@ -409,6 +409,9 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, if (!count) return 0; + if (WARN_ON(is_sync_kiocb(iocb) && !wait_for_completion)) + return -EIO; + dio = kmalloc(sizeof(*dio), GFP_KERNEL); if (!dio) return -ENOMEM; @@ -430,7 +433,7 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, if (pos >= dio->i_size) goto out_free_dio; - if (iter_is_iovec(iter) && iov_iter_rw(iter) == READ) + if (iter_is_iovec(iter)) dio->flags |= IOMAP_DIO_DIRTY; } else { flags |= IOMAP_WRITE; |