From: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Date: Tue, 29 Dec 2009 07:53:54 +0000 (+0100)
Subject: block: Honor the gfp_mask for alloc_page() in blkdev_issue_discard()
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e79e95db5cffb2e01170d510686489c40937faa1;p=openwrt%2Fstaging%2Fblogic.git

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

Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

diff --git a/block/blk-barrier.c b/block/blk-barrier.c
index 8873b9b439ff..8618d8996fea 100644
--- a/block/blk-barrier.c
+++ b/block/blk-barrier.c
@@ -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)