Merge branch 'for-7.1/block' into for-next

axboe · axboe · commit e7cbe110ab3c · 2026-03-23T07:58:45.000-06:00
* for-7.1/block:
  block: fix bio_alloc_bioset slowpath GFP handling
diff --git a/block/bio.c b/block/bio.c
@@ -581,11 +581,11 @@ struct bio *bio_alloc_bioset(struct block_device *bdev, unsigned short nr_vecs,
 		 */
 		opf &= ~REQ_ALLOC_CACHE;
 
-		p = mempool_alloc(&bs->bio_pool, gfp);
+		p = mempool_alloc(&bs->bio_pool, saved_gfp);
 		bio = p + bs->front_pad;
 		if (nr_vecs > BIO_INLINE_VECS) {
 			nr_vecs = BIO_MAX_VECS;
-			bvecs = mempool_alloc(&bs->bvec_pool, gfp);
+			bvecs = mempool_alloc(&bs->bvec_pool, saved_gfp);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -581,11 +581,11 @@ struct bio bio_alloc_bioset(struct block_device bdev, unsigned short nr_vecs,`
`581`	`581`	`*/`
`582`	`582`	`opf &= ~REQ_ALLOC_CACHE;`
`583`	`583`
`584`		`- p = mempool_alloc(&bs->bio_pool, gfp);`
	`584`	`+ p = mempool_alloc(&bs->bio_pool, saved_gfp);`
`585`	`585`	`bio = p + bs->front_pad;`
`586`	`586`	`if (nr_vecs > BIO_INLINE_VECS) {`
`587`	`587`	`nr_vecs = BIO_MAX_VECS;`
`588`		`- bvecs = mempool_alloc(&bs->bvec_pool, gfp);`
	`588`	`+ bvecs = mempool_alloc(&bs->bvec_pool, saved_gfp);`
`589`	`589`	`}`
`590`	`590`	`}`
`591`	`591`