iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

direct-io: use bio_release_pages in dio_bio_complete

Browse Source 
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>
This commit is contained in:
Christoph Hellwig 2019-06-26 15:49:27 +02:00 committed by Jens Axboe
parent 9fec4a2188
commit d7c8aa85ed
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs/direct-io.c
View File

@ -538,8 +538,8 @@ static struct bio *dio_await_one(struct dio *dio)
*/ */
static blk_status_t dio_bio_complete(struct dio *dio, struct bio *bio) static blk_status_t dio_bio_complete(struct dio *dio, struct bio *bio)
{ {
struct bio_vec *bvec;
blk_status_t err = bio->bi_status; blk_status_t err = bio->bi_status;
bool should_dirty = dio->op == REQ_OP_READ && dio->should_dirty;
if (err) { if (err) {
if (err == BLK_STS_AGAIN && (bio->bi_opf & REQ_NOWAIT)) if (err == BLK_STS_AGAIN && (bio->bi_opf & REQ_NOWAIT))
@ -548,19 +548,10 @@ static blk_status_t dio_bio_complete(struct dio *dio, struct bio *bio)
dio->io_error = -EIO; dio->io_error = -EIO;
} }
if (dio->is_async && dio->op == REQ_OP_READ && dio->should_dirty) { if (dio->is_async && should_dirty) {
bio_check_pages_dirty(bio); /* transfers ownership */ bio_check_pages_dirty(bio); /* transfers ownership */
} else { } else {
struct bvec_iter_all iter_all; bio_release_pages(bio, should_dirty);
bio_for_each_segment_all(bvec, bio, iter_all) {
struct page *page = bvec->bv_page;
if (dio->op == REQ_OP_READ && !PageCompound(page) &&
dio->should_dirty)
set_page_dirty_lock(page);
put_page(page);
}
bio_put(bio); bio_put(bio);
} }
return err; return err;