diff options
| author |   Christoph Hellwig <hch@lst.de> | 2019-06-17 11:14:11 +0200 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2019-06-17 09:33:02 -0600 |
| commit | ff896738be381efa6e50ba9a3b6cdc94f69ada42 (patch) | |
| tree | db48d8e6ce3cf63e89a9f5b0c7975709290aa75a /include/linux/bio.h | |
| parent | block/ps3vram: Use %llu to format sector_t after LBDAF removal (diff) | |
| download | wireguard-linux-ff896738be381efa6e50ba9a3b6cdc94f69ada42.tar.xz wireguard-linux-ff896738be381efa6e50ba9a3b6cdc94f69ada42.zip | |
block: return from __bio_try_merge_page if merging occured in the same page
We currently have an input same_page parameter to __bio_try_merge_page
to prohibit merging in the same page. The rationale for that is that
some callers need to account for every page added to a bio. Instead of
letting these callers call twice into the merge code to account for the
new vs existing page cases, just turn the paramter into an output one that
returns if a merge in the same page occured and let them act accordingly.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'include/linux/bio.h')
| -rw-r--r-- | include/linux/bio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/bio.h b/include/linux/bio.h index 0f23b5682640..f87abaa898f0 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -423,7 +423,7 @@ extern int bio_add_page(struct bio *, struct page *, unsigned int,unsigned int); extern int bio_add_pc_page(struct request_queue *, struct bio *, struct page *, unsigned int, unsigned int); bool __bio_try_merge_page(struct bio *bio, struct page *page, - unsigned int len, unsigned int off, bool same_page); + unsigned int len, unsigned int off, bool *same_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); |