summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-06-20 09:58:35 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-06-20 09:58:35 -0700
commit41a247d896d20b2b7c73ec40523d7caf058c0698 (patch)
treee1acfa6937c408932c8d267753b8bdb448c5dc98 /include
parent241e39004581475b2802cd63c111fec43bb0123e (diff)
parent440078db7a5539b36bd780a826cb6e2cf2cce0d0 (diff)
downloadlinux-stable-41a247d896d20b2b7c73ec40523d7caf058c0698.tar.gz
linux-stable-41a247d896d20b2b7c73ec40523d7caf058c0698.tar.bz2
linux-stable-41a247d896d20b2b7c73ec40523d7caf058c0698.zip
Merge tag 'for-linus-20190620' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe: "Three fixes that should go into this series. One is a set of two patches from Christoph, fixing a page leak on same page merges. Boiled down version of a bigger fix, but this one is more appropriate for this late in the cycle (and easier to backport to stable). The last patch is for a divide error in MD, from Mariusz (via Song)" * tag 'for-linus-20190620' of git://git.kernel.dk/linux-block: md: fix for divide error in status_resync block: fix page leak when merging to same page block: return from __bio_try_merge_page if merging occured in the same page
Diffstat (limited to 'include')
-rw-r--r--include/linux/bio.h2
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);