Commit 752d422e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-5.18/alloc-cleanups-2022-03-25' of git://git.kernel.dk/linux-block 

Pull bio allocation fix from Jens Axboe:
 "We got some reports of users seeing:

	Unexpected gfp: 0x2 (__GFP_HIGHMEM). Fixing up to gfp: 0x1192888

  which is a regression caused by the bio allocation cleanups"

* tag 'for-5.18/alloc-cleanups-2022-03-25' of git://git.kernel.dk/linux-block:
  fs: do not pass __GFP_HIGHMEM to bio_alloc in do_mpage_readpage
parents 561593a0 61285ff7

fs/mpage.c

+2 −4
Original line number Diff line number Diff line
@@ -148,13 +148,11 @@ static struct bio *do_mpage_readpage(struct mpage_readpage_args *args) 
	int op = REQ_OP_READ;

	unsigned nblocks;

	unsigned relative_block;

	gfp_t gfp;

	gfp_t gfp = mapping_gfp_constraint(page->mapping, GFP_KERNEL);



	if (args->is_readahead) {

		op |= REQ_RAHEAD;

		gfp = readahead_gfp_mask(page->mapping);

	} else {

		gfp = mapping_gfp_constraint(page->mapping, GFP_KERNEL);

		gfp |= __GFP_NORETRY | __GFP_NOWARN;

	}



	if (page_has_buffers(page))