Message ID | 1497729594-4707-7-git-send-email-axboe@kernel.dk (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Sat, Jun 17, 2017 at 01:59:49PM -0600, Jens Axboe wrote: > Reviewed-by: Andreas Dilger <adilger@dilger.ca> > Signed-off-by: Jens Axboe <axboe@kernel.dk> > --- > fs/block_dev.c | 2 ++ > fs/direct-io.c | 2 ++ > fs/iomap.c | 1 + > 3 files changed, 5 insertions(+) > > diff --git a/fs/block_dev.c b/fs/block_dev.c > index 519599dddd36..b9222a9d285e 100644 > --- a/fs/block_dev.c > +++ b/fs/block_dev.c > @@ -239,6 +239,7 @@ __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter, > should_dirty = true; > } else { > bio.bi_opf = dio_bio_write_op(iocb); > + bio.bi_opf |= write_hint_to_opf(iocb_write_hint(iocb)); Move this into dio_bio_write_op instead of duplicating it?
On 06/19/2017 12:28 AM, Christoph Hellwig wrote: > On Sat, Jun 17, 2017 at 01:59:49PM -0600, Jens Axboe wrote: >> Reviewed-by: Andreas Dilger <adilger@dilger.ca> >> Signed-off-by: Jens Axboe <axboe@kernel.dk> >> --- >> fs/block_dev.c | 2 ++ >> fs/direct-io.c | 2 ++ >> fs/iomap.c | 1 + >> 3 files changed, 5 insertions(+) >> >> diff --git a/fs/block_dev.c b/fs/block_dev.c >> index 519599dddd36..b9222a9d285e 100644 >> --- a/fs/block_dev.c >> +++ b/fs/block_dev.c >> @@ -239,6 +239,7 @@ __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter, >> should_dirty = true; >> } else { >> bio.bi_opf = dio_bio_write_op(iocb); >> + bio.bi_opf |= write_hint_to_opf(iocb_write_hint(iocb)); > > Move this into dio_bio_write_op instead of duplicating it? Good cleanup, will do.
diff --git a/fs/block_dev.c b/fs/block_dev.c index 519599dddd36..b9222a9d285e 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -239,6 +239,7 @@ __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter, should_dirty = true; } else { bio.bi_opf = dio_bio_write_op(iocb); + bio.bi_opf |= write_hint_to_opf(iocb_write_hint(iocb)); task_io_account_write(ret); } @@ -374,6 +375,7 @@ __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, int nr_pages) bio_set_pages_dirty(bio); } else { bio->bi_opf = dio_bio_write_op(iocb); + bio->bi_opf |= write_hint_to_opf(iocb_write_hint(iocb)); task_io_account_write(bio->bi_iter.bi_size); } diff --git a/fs/direct-io.c b/fs/direct-io.c index a04ebea77de8..1253b059eae6 100644 --- a/fs/direct-io.c +++ b/fs/direct-io.c @@ -386,6 +386,8 @@ dio_bio_alloc(struct dio *dio, struct dio_submit *sdio, else bio->bi_end_io = dio_bio_end_io; + bio->bi_opf |= write_hint_to_opf(iocb_write_hint(dio->iocb)); + sdio->bio = bio; sdio->logical_offset_in_bio = sdio->cur_page_fs_offset; } diff --git a/fs/iomap.c b/fs/iomap.c index 4b10892967a5..e8639861bd80 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -804,6 +804,7 @@ iomap_dio_actor(struct inode *inode, loff_t pos, loff_t length, if (dio->flags & IOMAP_DIO_WRITE) { bio_set_op_attrs(bio, REQ_OP_WRITE, REQ_SYNC | REQ_IDLE); + bio->bi_opf |= write_hint_to_opf(inode_write_hint(inode)); task_io_account_write(bio->bi_iter.bi_size); } else { bio_set_op_attrs(bio, REQ_OP_READ, 0);