Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-29 14:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

mm/mempool.c: remove unused argument in kasan_unpoison_element() and remove_element()

Browse Source 
The argument "gfp_t flags" is not used in kasan_unpoison_element() and
remove_element(), so remove it.

Link: http://lkml.kernel.org/r/20180621070332.16633-1-baijiaju1990@gmail.com
Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
Reviewed-by: Matthew Wilcox <willy@infradead.org>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jia-Ju Bai 2018-08-17 15:45:22 -07:00 committed by Linus Torvalds
parent bb451fdf3d
commit 8cded8668e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mm/mempool.c
View File

@ -111,7 +111,7 @@ static __always_inline void kasan_poison_element(mempool_t *pool, void *element)
kasan_free_pages(element, (unsigned long)pool->pool_data); kasan_free_pages(element, (unsigned long)pool->pool_data);
} }
static void kasan_unpoison_element(mempool_t *pool, void *element, gfp_t flags) static void kasan_unpoison_element(mempool_t *pool, void *element)
{ {
if (pool->alloc == mempool_alloc_slab || pool->alloc == mempool_kmalloc) if (pool->alloc == mempool_alloc_slab || pool->alloc == mempool_kmalloc)
kasan_unpoison_slab(element); kasan_unpoison_slab(element);
@ -127,12 +127,12 @@ static __always_inline void add_element(mempool_t *pool, void *element)
pool->elements[pool->curr_nr++] = element; pool->elements[pool->curr_nr++] = element;
} }
static void *remove_element(mempool_t *pool, gfp_t flags) static void *remove_element(mempool_t *pool)
{ {
void *element = pool->elements[--pool->curr_nr]; void *element = pool->elements[--pool->curr_nr];
BUG_ON(pool->curr_nr < 0); BUG_ON(pool->curr_nr < 0);
kasan_unpoison_element(pool, element, flags); kasan_unpoison_element(pool, element);
check_element(pool, element); check_element(pool, element);
return element; return element;
} }
@ -151,7 +151,7 @@ static void *remove_element(mempool_t *pool, gfp_t flags)
void mempool_exit(mempool_t *pool) void mempool_exit(mempool_t *pool)
{ {
while (pool->curr_nr) { while (pool->curr_nr) {
void *element = remove_element(pool, GFP_KERNEL); void *element = remove_element(pool);
pool->free(element, pool->pool_data); pool->free(element, pool->pool_data);
} }
kfree(pool->elements); kfree(pool->elements);
@ -301,7 +301,7 @@ int mempool_resize(mempool_t *pool, int new_min_nr)
spin_lock_irqsave(&pool->lock, flags); spin_lock_irqsave(&pool->lock, flags);
if (new_min_nr <= pool->min_nr) { if (new_min_nr <= pool->min_nr) {
while (new_min_nr < pool->curr_nr) { while (new_min_nr < pool->curr_nr) {
element = remove_element(pool, GFP_KERNEL); element = remove_element(pool);
spin_unlock_irqrestore(&pool->lock, flags); spin_unlock_irqrestore(&pool->lock, flags);
pool->free(element, pool->pool_data); pool->free(element, pool->pool_data);
spin_lock_irqsave(&pool->lock, flags); spin_lock_irqsave(&pool->lock, flags);
@ -387,7 +387,7 @@ repeat_alloc:
spin_lock_irqsave(&pool->lock, flags); spin_lock_irqsave(&pool->lock, flags);
if (likely(pool->curr_nr)) { if (likely(pool->curr_nr)) {
element = remove_element(pool, gfp_temp); element = remove_element(pool);
spin_unlock_irqrestore(&pool->lock, flags); spin_unlock_irqrestore(&pool->lock, flags);
/* paired with rmb in mempool_free(), read comment there */ /* paired with rmb in mempool_free(), read comment there */
smp_wmb(); smp_wmb();