summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2019-06-26 15:49:22 +0200
committerJens Axboe <axboe@kernel.dk>2019-06-29 09:47:31 -0600
commit163cc2d3cd87af82b589bc2327285505eeac3842 (patch)
tree3f05635fc1546e62883f49c9a7cba88ecf785acf /block
parentd241a95f3514a5eb544dfd8d9d141ffd1c89b707 (diff)
downloadlinux-stable-163cc2d3cd87af82b589bc2327285505eeac3842.tar.gz
linux-stable-163cc2d3cd87af82b589bc2327285505eeac3842.tar.bz2
linux-stable-163cc2d3cd87af82b589bc2327285505eeac3842.zip
block: use bio_release_pages in bio_unmap_user
Use bio_release_pages instead of open coding it. Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com> Reviewed-by: Minwoo Im <minwoo.im.dev@gmail.com> Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r--block/bio.c21
1 files changed, 2 insertions, 19 deletions
diff --git a/block/bio.c b/block/bio.c
index 8a7b315630ce..c759f5598513 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -1437,24 +1437,6 @@ struct bio *bio_map_user_iov(struct request_queue *q,
return ERR_PTR(ret);
}
-static void __bio_unmap_user(struct bio *bio)
-{
- struct bio_vec *bvec;
- struct bvec_iter_all iter_all;
-
- /*
- * make sure we dirty pages we wrote to
- */
- bio_for_each_segment_all(bvec, bio, iter_all) {
- if (bio_data_dir(bio) == READ)
- set_page_dirty_lock(bvec->bv_page);
-
- put_page(bvec->bv_page);
- }
-
- bio_put(bio);
-}
-
/**
* bio_unmap_user - unmap a bio
* @bio: the bio being unmapped
@@ -1466,7 +1448,8 @@ static void __bio_unmap_user(struct bio *bio)
*/
void bio_unmap_user(struct bio *bio)
{
- __bio_unmap_user(bio);
+ bio_release_pages(bio, bio_data_dir(bio) == READ);
+ bio_put(bio);
bio_put(bio);
}