diff mbox

mm: mempool: Remove unused argument in kasan_unpoison_element() and remove_element()

Message ID 20180621070332.16633-1-baijiaju1990@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Jia-Ju Bai June 21, 2018, 7:03 a.m. UTC
The argument "gfp_t flags" is not used in kasan_unpoison_element() 
and remove_element(), so remove it.

Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
---
 mm/mempool.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Matthew Wilcox June 21, 2018, 7:16 a.m. UTC | #1
On Thu, Jun 21, 2018 at 03:03:32PM +0800, Jia-Ju Bai wrote:
> The argument "gfp_t flags" is not used in kasan_unpoison_element() 
> and remove_element(), so remove it.
> 
> Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>

Reviewed-by: Matthew Wilcox <willy@infradead.org>
Michal Hocko June 21, 2018, 2:59 p.m. UTC | #2
On Thu 21-06-18 15:03:32, Jia-Ju Bai wrote:
> The argument "gfp_t flags" is not used in kasan_unpoison_element() 
> and remove_element(), so remove it.

yeah, seems like left over from 9b75a867cc9d ("mm: mempool: kasan: don't
poot mempool objects in quarantine")
 
> Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>

Acked-by: Michal Hocko <mhocko@suse.com>

> ---
>  mm/mempool.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/mm/mempool.c b/mm/mempool.c
> index 5c9dce34719b..3076ab3f7bc4 100644
> --- a/mm/mempool.c
> +++ b/mm/mempool.c
> @@ -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);
>  }
>  
> -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)
>  		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;
>  }
>  
> -static void *remove_element(mempool_t *pool, gfp_t flags)
> +static void *remove_element(mempool_t *pool)
>  {
>  	void *element = pool->elements[--pool->curr_nr];
>  
>  	BUG_ON(pool->curr_nr < 0);
> -	kasan_unpoison_element(pool, element, flags);
> +	kasan_unpoison_element(pool, element);
>  	check_element(pool, element);
>  	return element;
>  }
> @@ -151,7 +151,7 @@ void mempool_destroy(mempool_t *pool)
>  		return;
>  
>  	while (pool->curr_nr) {
> -		void *element = remove_element(pool, GFP_KERNEL);
> +		void *element = remove_element(pool);
>  		pool->free(element, pool->pool_data);
>  	}
>  	kfree(pool->elements);
> @@ -247,7 +247,7 @@ int mempool_resize(mempool_t *pool, int new_min_nr)
>  	spin_lock_irqsave(&pool->lock, flags);
>  	if (new_min_nr <= pool->min_nr) {
>  		while (new_min_nr < pool->curr_nr) {
> -			element = remove_element(pool, GFP_KERNEL);
> +			element = remove_element(pool);
>  			spin_unlock_irqrestore(&pool->lock, flags);
>  			pool->free(element, pool->pool_data);
>  			spin_lock_irqsave(&pool->lock, flags);
> @@ -333,7 +333,7 @@ void *mempool_alloc(mempool_t *pool, gfp_t gfp_mask)
>  
>  	spin_lock_irqsave(&pool->lock, flags);
>  	if (likely(pool->curr_nr)) {
> -		element = remove_element(pool, gfp_temp);
> +		element = remove_element(pool);
>  		spin_unlock_irqrestore(&pool->lock, flags);
>  		/* paired with rmb in mempool_free(), read comment there */
>  		smp_wmb();
> -- 
> 2.17.0
diff mbox

Patch

diff --git a/mm/mempool.c b/mm/mempool.c
index 5c9dce34719b..3076ab3f7bc4 100644
--- a/mm/mempool.c
+++ b/mm/mempool.c
@@ -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);
 }
 
-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)
 		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;
 }
 
-static void *remove_element(mempool_t *pool, gfp_t flags)
+static void *remove_element(mempool_t *pool)
 {
 	void *element = pool->elements[--pool->curr_nr];
 
 	BUG_ON(pool->curr_nr < 0);
-	kasan_unpoison_element(pool, element, flags);
+	kasan_unpoison_element(pool, element);
 	check_element(pool, element);
 	return element;
 }
@@ -151,7 +151,7 @@  void mempool_destroy(mempool_t *pool)
 		return;
 
 	while (pool->curr_nr) {
-		void *element = remove_element(pool, GFP_KERNEL);
+		void *element = remove_element(pool);
 		pool->free(element, pool->pool_data);
 	}
 	kfree(pool->elements);
@@ -247,7 +247,7 @@  int mempool_resize(mempool_t *pool, int new_min_nr)
 	spin_lock_irqsave(&pool->lock, flags);
 	if (new_min_nr <= pool->min_nr) {
 		while (new_min_nr < pool->curr_nr) {
-			element = remove_element(pool, GFP_KERNEL);
+			element = remove_element(pool);
 			spin_unlock_irqrestore(&pool->lock, flags);
 			pool->free(element, pool->pool_data);
 			spin_lock_irqsave(&pool->lock, flags);
@@ -333,7 +333,7 @@  void *mempool_alloc(mempool_t *pool, gfp_t gfp_mask)
 
 	spin_lock_irqsave(&pool->lock, flags);
 	if (likely(pool->curr_nr)) {
-		element = remove_element(pool, gfp_temp);
+		element = remove_element(pool);
 		spin_unlock_irqrestore(&pool->lock, flags);
 		/* paired with rmb in mempool_free(), read comment there */
 		smp_wmb();