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

Commit a91a5ac6 authored by Tejun Heo's avatar Tejun Heo Committed by Jens Axboe
Browse files

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: default avatarTejun Heo <tj@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 15974993

block/blk-core.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

include/linux/mempool.h

+2 −1
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ typedef struct mempool_s { 
extern mempool_t *mempool_create(int min_nr, mempool_alloc_t *alloc_fn,

			mempool_free_t *free_fn, void *pool_data);

extern mempool_t *mempool_create_node(int min_nr, mempool_alloc_t *alloc_fn,

			mempool_free_t *free_fn, void *pool_data, int nid);

			mempool_free_t *free_fn, void *pool_data,

			gfp_t gfp_mask, int nid);



extern int mempool_resize(mempool_t *pool, int new_min_nr, gfp_t gfp_mask);

extern void mempool_destroy(mempool_t *pool);

mm/mempool.c

+7 −5
Original line number Diff line number Diff line
@@ -63,19 +63,21 @@ EXPORT_SYMBOL(mempool_destroy); 
mempool_t *mempool_create(int min_nr, mempool_alloc_t *alloc_fn,

				mempool_free_t *free_fn, void *pool_data)

{

	return  mempool_create_node(min_nr,alloc_fn,free_fn, pool_data,-1);

	return mempool_create_node(min_nr,alloc_fn,free_fn, pool_data,

				   GFP_KERNEL, NUMA_NO_NODE);

}

EXPORT_SYMBOL(mempool_create);



mempool_t *mempool_create_node(int min_nr, mempool_alloc_t *alloc_fn,

			mempool_free_t *free_fn, void *pool_data, int node_id)

			       mempool_free_t *free_fn, void *pool_data,

			       gfp_t gfp_mask, int node_id)

{

	mempool_t *pool;

	pool = kmalloc_node(sizeof(*pool), GFP_KERNEL | __GFP_ZERO, node_id);

	pool = kmalloc_node(sizeof(*pool), gfp_mask | __GFP_ZERO, node_id);

	if (!pool)

		return NULL;

	pool->elements = kmalloc_node(min_nr * sizeof(void *),

					GFP_KERNEL, node_id);

				      gfp_mask, node_id);

	if (!pool->elements) {

		kfree(pool);

		return NULL;
@@ -93,7 +95,7 @@ mempool_t *mempool_create_node(int min_nr, mempool_alloc_t *alloc_fn, 
	while (pool->curr_nr < pool->min_nr) {

		void *element;



		element = pool->alloc(GFP_KERNEL, pool->pool_data);

		element = pool->alloc(gfp_mask, pool->pool_data);

		if (unlikely(!element)) {

			mempool_destroy(pool);

			return NULL;