diff options
| author |   Christoph Hellwig <hch@lst.de> | 2019-06-26 15:49:26 +0200 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2019-06-29 09:47:31 -0600 |
| commit | 9fec4a21886e67c3337e1762eda9f71a1822cba8 (patch) | |
| tree | 11a2697e8c4ae8d80c7a56d3d1dac235a27ec3b9 /fs/block_dev.c | |
| parent | block_dev: use bio_release_pages in blkdev_bio_end_io (diff) | |
| download | linux-dev-9fec4a21886e67c3337e1762eda9f71a1822cba8.tar.xz linux-dev-9fec4a21886e67c3337e1762eda9f71a1822cba8.zip | |
block_dev: use bio_release_pages in bio_unmap_user
Use bio_release_pages instead of duplicating it.
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/block_dev.c')
| -rw-r--r-- | fs/block_dev.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index a6572a811880..f00b569a9f89 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -203,13 +203,12 @@ __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter, { struct file *file = iocb->ki_filp; struct block_device *bdev = I_BDEV(bdev_file_inode(file)); - struct bio_vec inline_vecs[DIO_INLINE_BIO_VECS], *vecs, *bvec; + struct bio_vec inline_vecs[DIO_INLINE_BIO_VECS], *vecs; loff_t pos = iocb->ki_pos; bool should_dirty = false; struct bio bio; ssize_t ret; blk_qc_t qc; - struct bvec_iter_all iter_all; if ((pos | iov_iter_alignment(iter)) & (bdev_logical_block_size(bdev) - 1)) @@ -259,13 +258,7 @@ __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter, } __set_current_state(TASK_RUNNING); - bio_for_each_segment_all(bvec, &bio, iter_all) { - if (should_dirty && !PageCompound(bvec->bv_page)) - set_page_dirty_lock(bvec->bv_page); - if (!bio_flagged(&bio, BIO_NO_PAGE_REF)) - put_page(bvec->bv_page); - } - + bio_release_pages(&bio, should_dirty); if (unlikely(bio.bi_status)) ret = blk_status_to_errno(bio.bi_status); |