diff options
| author | Jens Axboe | 2016-11-17 17:50:47 +0100 |
|---|---|---|
| committer | Jens Axboe | 2016-11-17 21:35:05 +0100 |
| commit | 78250c02d9739b5b20f1884f8c1b30efc2f861e4 (patch) | |
| tree | db9c1d866205fe695e6358d3534bfacabe3a1366 /fs | |
| parent | block: support a full bio worth of IO for simplified bdev direct-io (diff) | |
| download | kernel-qcow2-linux-78250c02d9739b5b20f1884f8c1b30efc2f861e4.tar.gz kernel-qcow2-linux-78250c02d9739b5b20f1884f8c1b30efc2f861e4.tar.xz kernel-qcow2-linux-78250c02d9739b5b20f1884f8c1b30efc2f861e4.zip | |
block: make __blkdev_direct_IO_sync() support O_SYNC/DSYNC
Split the op setting code into a helper, use it in both places.
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/block_dev.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index dad97e19bb1f..a1b9abe6231c 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -176,6 +176,16 @@ static struct inode *bdev_file_inode(struct file *file) return file->f_mapping->host; } +static unsigned int dio_bio_write_op(struct kiocb *iocb) +{ + unsigned int op = REQ_OP_WRITE | REQ_SYNC | REQ_IDLE; + + /* avoid the need for a I/O completion work item */ + if (iocb->ki_flags & IOCB_DSYNC) + op |= REQ_FUA; + return op; +} + #define DIO_INLINE_BIO_VECS 4 static void blkdev_bio_end_io_simple(struct bio *bio) @@ -226,11 +236,11 @@ __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter, ret = bio.bi_iter.bi_size; if (iov_iter_rw(iter) == READ) { - bio_set_op_attrs(&bio, REQ_OP_READ, 0); + bio.bi_opf = REQ_OP_READ; if (iter_is_iovec(iter)) should_dirty = true; } else { - bio_set_op_attrs(&bio, REQ_OP_WRITE, REQ_SYNC | REQ_IDLE); + bio.bi_opf = dio_bio_write_op(iocb); task_io_account_write(ret); } |