diff options
| author | OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> | 2009-12-29 08:53:54 +0100 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-12-29 08:53:54 +0100 |
| commit | e79e95db5cffb2e01170d510686489c40937faa1 (patch) | |
| tree | b21b0f4be2edf79f3e68c628c3022cda6a72e949 /block/blk-barrier.c | |
| parent | block: Fix incorrect alignment offset reporting and update documentation (diff) | |
| download | linux-e79e95db5cffb2e01170d510686489c40937faa1.tar.xz linux-e79e95db5cffb2e01170d510686489c40937faa1.zip | |
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>
Diffstat (limited to 'block/blk-barrier.c')
| -rw-r--r-- | block/blk-barrier.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) |