[v2,1/3] mm/damon/paddr: minor refactor of damon_pa_pageout()

Message ID 20230303084343.171958-2-wangkefeng.wang@huawei.com
State New
Headers
Series mm/damon/paddr: minor code improvement |

Commit Message

Kefeng Wang March 3, 2023, 8:43 a.m. UTC
  Omit three lines by unified folio_put(), and make code more clear.

Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
 mm/damon/paddr.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)
  

Comments

SeongJae Park March 3, 2023, 6:41 p.m. UTC | #1
On Fri, 3 Mar 2023 16:43:41 +0800 Kefeng Wang <wangkefeng.wang@huawei.com> wrote:

> Omit three lines by unified folio_put(), and make code more clear.
> 
> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>

Reviewed-by: SeongJae Park <sj@kernel.org>


Thanks,
SJ

> ---
>  mm/damon/paddr.c | 13 +++++--------
>  1 file changed, 5 insertions(+), 8 deletions(-)
> 
> diff --git a/mm/damon/paddr.c b/mm/damon/paddr.c
> index 6c655d9b5639..3fda00a0f786 100644
> --- a/mm/damon/paddr.c
> +++ b/mm/damon/paddr.c
> @@ -239,21 +239,18 @@ static unsigned long damon_pa_pageout(struct damon_region *r, struct damos *s)
>  		if (!folio)
>  			continue;
>  
> -		if (damos_pa_filter_out(s, folio)) {
> -			folio_put(folio);
> -			continue;
> -		}
> +		if (damos_pa_filter_out(s, folio))
> +			goto put_folio;
>  
>  		folio_clear_referenced(folio);
>  		folio_test_clear_young(folio);
> -		if (!folio_isolate_lru(folio)) {
> -			folio_put(folio);
> -			continue;
> -		}
> +		if (!folio_isolate_lru(folio))
> +			goto put_folio;
>  		if (folio_test_unevictable(folio))
>  			folio_putback_lru(folio);
>  		else
>  			list_add(&folio->lru, &folio_list);
> +put_folio:
>  		folio_put(folio);
>  	}
>  	applied = reclaim_pages(&folio_list);
> -- 
> 2.35.3
> 
>
  

Patch

diff --git a/mm/damon/paddr.c b/mm/damon/paddr.c
index 6c655d9b5639..3fda00a0f786 100644
--- a/mm/damon/paddr.c
+++ b/mm/damon/paddr.c
@@ -239,21 +239,18 @@  static unsigned long damon_pa_pageout(struct damon_region *r, struct damos *s)
 		if (!folio)
 			continue;
 
-		if (damos_pa_filter_out(s, folio)) {
-			folio_put(folio);
-			continue;
-		}
+		if (damos_pa_filter_out(s, folio))
+			goto put_folio;
 
 		folio_clear_referenced(folio);
 		folio_test_clear_young(folio);
-		if (!folio_isolate_lru(folio)) {
-			folio_put(folio);
-			continue;
-		}
+		if (!folio_isolate_lru(folio))
+			goto put_folio;
 		if (folio_test_unevictable(folio))
 			folio_putback_lru(folio);
 		else
 			list_add(&folio->lru, &folio_list);
+put_folio:
 		folio_put(folio);
 	}
 	applied = reclaim_pages(&folio_list);