Commit c809084a authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

block: inline a part of bio_release_pages() 



Inline BIO_NO_PAGE_REF check of bio_release_pages() to avoid function
call.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 1497a51a

block/bio.c

+2 −5
Original line number Diff line number Diff line
@@ -1033,21 +1033,18 @@ int bio_add_page(struct bio *bio, struct page *page, 
}

EXPORT_SYMBOL(bio_add_page);



void bio_release_pages(struct bio *bio, bool mark_dirty)

void __bio_release_pages(struct bio *bio, bool mark_dirty)

{

	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) {

		if (mark_dirty && !PageCompound(bvec->bv_page))

			set_page_dirty_lock(bvec->bv_page);

		put_page(bvec->bv_page);

	}

}

EXPORT_SYMBOL_GPL(bio_release_pages);

EXPORT_SYMBOL_GPL(__bio_release_pages);



static void __bio_iov_bvec_set(struct bio *bio, struct iov_iter *iter)

{

include/linux/bio.h

+7 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ int bio_add_zone_append_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, bool mark_dirty);

void __bio_release_pages(struct bio *bio, bool mark_dirty);

extern void bio_set_pages_dirty(struct bio *bio);

extern void bio_check_pages_dirty(struct bio *bio);
@@ -428,6 +428,12 @@ extern void bio_free_pages(struct bio *bio); 
void guard_bio_eod(struct bio *bio);

void zero_fill_bio(struct bio *bio);



static inline void bio_release_pages(struct bio *bio, bool mark_dirty)

{

	if (!bio_flagged(bio, BIO_NO_PAGE_REF))

		__bio_release_pages(bio, mark_dirty);

}



extern const char *bio_devname(struct bio *bio, char *buffer);



#define bio_dev(bio) \