diff options
author | Tejun Heo <tj@kernel.org> | 2012-06-04 23:40:53 -0400 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2012-06-25 05:53:47 -0400 |
commit | a91a5ac6858fbf7477131e1210cb3e897b668e6f (patch) | |
tree | 01ff0eff5088efc3459cf139e349414e35068493 /block | |
parent | 159749937a3e1605068a454b1607cdc5714f16e6 (diff) |
mempool: add @gfp_mask to mempool_create_node()
mempool_create_node() currently assumes %GFP_KERNEL. Its only user,
blk_init_free_list(), is about to be updated to use other allocation
flags - add @gfp_mask argument to the function.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r-- | block/blk-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 93eb3e4f88ce..64f9a8668253 100644 --- a/block/blk-core.c +++ b/block/blk-core.c | |||
@@ -531,8 +531,8 @@ static int blk_init_free_list(struct request_queue *q) | |||
531 | init_waitqueue_head(&rl->wait[BLK_RW_ASYNC]); | 531 | init_waitqueue_head(&rl->wait[BLK_RW_ASYNC]); |
532 | 532 | ||
533 | rl->rq_pool = mempool_create_node(BLKDEV_MIN_RQ, mempool_alloc_slab, | 533 | rl->rq_pool = mempool_create_node(BLKDEV_MIN_RQ, mempool_alloc_slab, |
534 | mempool_free_slab, request_cachep, q->node); | 534 | mempool_free_slab, request_cachep, |
535 | 535 | GFP_KERNEL, q->node); | |
536 | if (!rl->rq_pool) | 536 | if (!rl->rq_pool) |
537 | return -ENOMEM; | 537 | return -ENOMEM; |
538 | 538 | ||