block_dev: use bio_release_pages in bio_unmap_user (9fec4a21) · Commits · 戴 / test

fs/block_dev.c

+2 −9

Original line number	Diff line number	Diff line
		@@ -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);