Skip to content

Commit

Permalink
block: move the BIO_NO_PAGE_REF check into bio_release_pages
Browse files Browse the repository at this point in the history
Move the BIO_NO_PAGE_REF check into bio_release_pages instead of
duplicating it in both callers.

Also make the function available outside of bio.c so that we can
reuse it in other direct I/O implementations.

Reviewed-by: Minwoo Im <minwoo.im.dev@gmail.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
Christoph Hellwig authored and Jens Axboe committed Jun 29, 2019
1 parent 5f2ab0c commit b2d0d99
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
11 changes: 6 additions & 5 deletions block/bio.c
Original file line number Diff line number Diff line change
Expand Up @@ -845,11 +845,14 @@ static void bio_get_pages(struct bio *bio)
get_page(bvec->bv_page);
}

static void bio_release_pages(struct bio *bio)
void bio_release_pages(struct bio *bio)
{
struct bvec_iter_all iter_all;
struct bio_vec *bvec;

if (bio_flagged(bio, BIO_NO_PAGE_REF))
return;

bio_for_each_segment_all(bvec, bio, iter_all)
put_page(bvec->bv_page);
}
Expand Down Expand Up @@ -1681,8 +1684,7 @@ static void bio_dirty_fn(struct work_struct *work)
next = bio->bi_private;

bio_set_pages_dirty(bio);
if (!bio_flagged(bio, BIO_NO_PAGE_REF))
bio_release_pages(bio);
bio_release_pages(bio);
bio_put(bio);
}
}
Expand All @@ -1698,8 +1700,7 @@ void bio_check_pages_dirty(struct bio *bio)
goto defer;
}

if (!bio_flagged(bio, BIO_NO_PAGE_REF))
bio_release_pages(bio);
bio_release_pages(bio);
bio_put(bio);
return;
defer:
Expand Down
1 change: 1 addition & 0 deletions include/linux/bio.h
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,7 @@ bool __bio_try_merge_page(struct bio *bio, struct page *page,
void __bio_add_page(struct bio *bio, struct page *page,
unsigned int len, unsigned int off);
int bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter);
void bio_release_pages(struct bio *bio);
struct rq_map_data;
extern struct bio *bio_map_user_iov(struct request_queue *,
struct iov_iter *, gfp_t);
Expand Down

0 comments on commit b2d0d99

Please sign in to comment.