diff options
author | Tejun Heo <tj@kernel.org> | 2012-06-04 20:40:53 -0700 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2012-06-25 11:53:47 +0200 |
commit | a91a5ac6858fbf7477131e1210cb3e897b668e6f (patch) | |
tree | 01ff0eff5088efc3459cf139e349414e35068493 /block/blk-core.c | |
parent | 159749937a3e1605068a454b1607cdc5714f16e6 (diff) | |
download | op-kernel-dev-a91a5ac6858fbf7477131e1210cb3e897b668e6f.zip op-kernel-dev-a91a5ac6858fbf7477131e1210cb3e897b668e6f.tar.gz |
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/blk-core.c')
-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 93eb3e4..64f9a86 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) init_waitqueue_head(&rl->wait[BLK_RW_ASYNC]); rl->rq_pool = mempool_create_node(BLKDEV_MIN_RQ, mempool_alloc_slab, - mempool_free_slab, request_cachep, q->node); - + mempool_free_slab, request_cachep, + GFP_KERNEL, q->node); if (!rl->rq_pool) return -ENOMEM; |