Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e79e95db authored by OGAWA Hirofumi's avatar OGAWA Hirofumi Committed by Jens Axboe
Browse files

block: Honor the gfp_mask for alloc_page() in blkdev_issue_discard() 



Signed-off-by: default avatarOGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 81744ee4

block/blk-barrier.c

+1 −1
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ int blkdev_issue_discard(struct block_device *bdev, sector_t sector, 
		 * our current implementations need.  If we'll ever need

		 * more the interface will need revisiting.

		 */

		page = alloc_page(GFP_KERNEL | __GFP_ZERO);

		page = alloc_page(gfp_mask | __GFP_ZERO);

		if (!page)

			goto out_free_bio;

		if (bio_add_pc_page(q, bio, page, sector_size, 0) < sector_size)