diff mbox series

mm: zswap: remove unused tree argument in zswap_entry_put()

Message ID 20240125081423.1200336-1-yosryahmed@google.com
State New
Headers
Series mm: zswap: remove unused tree argument in zswap_entry_put() |

Commit Message

Yosry Ahmed Jan. 25, 2024, 8:14 a.m. UTC 
  Commit 7310895779624 ("mm: zswap: tighten up entry invalidation")
removed the usage of tree argument, delete it.

Signed-off-by: Yosry Ahmed <yosryahmed@google.com>
---
 mm/zswap.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

Comments

Chengming Zhou Jan. 25, 2024, 8:17 a.m. UTC | #1 
On 2024/1/25 16:14, Yosry Ahmed wrote:
> Commit 7310895779624 ("mm: zswap: tighten up entry invalidation")
> removed the usage of tree argument, delete it.
> 
> Signed-off-by: Yosry Ahmed <yosryahmed@google.com>

LGTM, thanks!

Reviewed-by: Chengming Zhou <zhouchengming@bytedance.com>

> ---
>  mm/zswap.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/mm/zswap.c b/mm/zswap.c
> index 78df16d307aa8..8f4a7efc2bdae 100644
> --- a/mm/zswap.c
> +++ b/mm/zswap.c
> @@ -569,8 +569,7 @@ static void zswap_entry_get(struct zswap_entry *entry)
>  /* caller must hold the tree lock
>  * remove from the tree and free it, if nobody reference the entry
>  */
> -static void zswap_entry_put(struct zswap_tree *tree,
> -			struct zswap_entry *entry)
> +static void zswap_entry_put(struct zswap_entry *entry)
>  {
>  	int refcount = --entry->refcount;
>  
> @@ -853,7 +852,7 @@ static void zswap_invalidate_entry(struct zswap_tree *tree,
>  				   struct zswap_entry *entry)
>  {
>  	if (zswap_rb_erase(&tree->rbroot, entry))
> -		zswap_entry_put(tree, entry);
> +		zswap_entry_put(entry);
>  }
>  
>  static enum lru_status shrink_memcg_cb(struct list_head *item, struct list_lru_one *l,
> @@ -924,7 +923,7 @@ static enum lru_status shrink_memcg_cb(struct list_head *item, struct list_lru_o
>  
>  put_unlock:
>  	/* Drop local reference */
> -	zswap_entry_put(tree, entry);
> +	zswap_entry_put(entry);
>  unlock:
>  	spin_unlock(&tree->lock);
>  	spin_lock(lock);
> @@ -1754,7 +1753,7 @@ bool zswap_load(struct folio *folio)
>  		zswap_lru_del(&entry->pool->list_lru, entry);
>  		zswap_lru_add(&entry->pool->list_lru, entry);
>  	}
> -	zswap_entry_put(tree, entry);
> +	zswap_entry_put(entry);
>  	spin_unlock(&tree->lock);
>  
>  	return true;
Johannes Weiner Jan. 25, 2024, 2:45 p.m. UTC | #2 
On Thu, Jan 25, 2024 at 08:14:23AM +0000, Yosry Ahmed wrote:
> Commit 7310895779624 ("mm: zswap: tighten up entry invalidation")
> removed the usage of tree argument, delete it.
> 
> Signed-off-by: Yosry Ahmed <yosryahmed@google.com>

Beat me to it :)

Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Nhat Pham Jan. 25, 2024, 6:30 p.m. UTC | #3 
On Thu, Jan 25, 2024 at 12:14 AM Yosry Ahmed <yosryahmed@google.com> wrote:
>
> Commit 7310895779624 ("mm: zswap: tighten up entry invalidation")
> removed the usage of tree argument, delete it.
>
> Signed-off-by: Yosry Ahmed <yosryahmed@google.com>
> ---
>  mm/zswap.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/mm/zswap.c b/mm/zswap.c
> index 78df16d307aa8..8f4a7efc2bdae 100644
> --- a/mm/zswap.c
> +++ b/mm/zswap.c
> @@ -569,8 +569,7 @@ static void zswap_entry_get(struct zswap_entry *entry)
>  /* caller must hold the tree lock
>  * remove from the tree and free it, if nobody reference the entry
>  */
> -static void zswap_entry_put(struct zswap_tree *tree,
> -                       struct zswap_entry *entry)
> +static void zswap_entry_put(struct zswap_entry *entry)
>  {
>         int refcount = --entry->refcount;
>
> @@ -853,7 +852,7 @@ static void zswap_invalidate_entry(struct zswap_tree *tree,
>                                    struct zswap_entry *entry)
>  {
>         if (zswap_rb_erase(&tree->rbroot, entry))
> -               zswap_entry_put(tree, entry);
> +               zswap_entry_put(entry);
>  }
>
>  static enum lru_status shrink_memcg_cb(struct list_head *item, struct list_lru_one *l,
> @@ -924,7 +923,7 @@ static enum lru_status shrink_memcg_cb(struct list_head *item, struct list_lru_o
>
>  put_unlock:
>         /* Drop local reference */
> -       zswap_entry_put(tree, entry);
> +       zswap_entry_put(entry);
>  unlock:
>         spin_unlock(&tree->lock);
>         spin_lock(lock);
> @@ -1754,7 +1753,7 @@ bool zswap_load(struct folio *folio)
>                 zswap_lru_del(&entry->pool->list_lru, entry);
>                 zswap_lru_add(&entry->pool->list_lru, entry);
>         }
> -       zswap_entry_put(tree, entry);
> +       zswap_entry_put(entry);
>         spin_unlock(&tree->lock);
>
>         return true;
> --
> 2.43.0.429.g432eaa2c6b-goog
>

Reviewed-by: Nhat Pham <nphamcs@gmail.com>
diff mbox series

Patch

diff --git a/mm/zswap.c b/mm/zswap.c
index 78df16d307aa8..8f4a7efc2bdae 100644
--- a/mm/zswap.c
+++ b/mm/zswap.c
@@ -569,8 +569,7 @@  static void zswap_entry_get(struct zswap_entry *entry)
 /* caller must hold the tree lock
 * remove from the tree and free it, if nobody reference the entry
 */
-static void zswap_entry_put(struct zswap_tree *tree,
-			struct zswap_entry *entry)
+static void zswap_entry_put(struct zswap_entry *entry)
 {
 	int refcount = --entry->refcount;
 
@@ -853,7 +852,7 @@  static void zswap_invalidate_entry(struct zswap_tree *tree,
 				   struct zswap_entry *entry)
 {
 	if (zswap_rb_erase(&tree->rbroot, entry))
-		zswap_entry_put(tree, entry);
+		zswap_entry_put(entry);
 }
 
 static enum lru_status shrink_memcg_cb(struct list_head *item, struct list_lru_one *l,
@@ -924,7 +923,7 @@  static enum lru_status shrink_memcg_cb(struct list_head *item, struct list_lru_o
 
 put_unlock:
 	/* Drop local reference */
-	zswap_entry_put(tree, entry);
+	zswap_entry_put(entry);
 unlock:
 	spin_unlock(&tree->lock);
 	spin_lock(lock);
@@ -1754,7 +1753,7 @@  bool zswap_load(struct folio *folio)
 		zswap_lru_del(&entry->pool->list_lru, entry);
 		zswap_lru_add(&entry->pool->list_lru, entry);
 	}
-	zswap_entry_put(tree, entry);
+	zswap_entry_put(entry);
 	spin_unlock(&tree->lock);
 
 	return true;