| Message ID | 20190626134928.7988-8-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/9] block: move the BIO_NO_PAGE_REF check into bio_release_pages | expand |
Looks good. Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com> On 06/26/2019 06:50 AM, Christoph Hellwig wrote: > Use bio_release_pages instead of duplicating it. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > fs/block_dev.c | 11 ++--------- > 1 file 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); > >
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);
Use bio_release_pages instead of duplicating it. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/block_dev.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)