damon.lists.linux.dev archive mirror
 help / color / mirror / Atom feed
From: Kefeng Wang <wangkefeng.wang@huawei.com>
To: SeongJae Park <sj@kernel.org>, Andrew Morton <akpm@linux-foundation.org>
Cc: <linux-mm@kvack.org>, <linux-kernel@vger.kernel.org>,
	<damon@lists.linux.dev>, Kefeng Wang <wangkefeng.wang@huawei.com>
Subject: [PATCH v2 2/3] mm/damon/paddr: minor refactor of damon_pa_young()
Date: Fri, 3 Mar 2023 16:43:42 +0800	[thread overview]
Message-ID: <20230303084343.171958-3-wangkefeng.wang@huawei.com> (raw)
In-Reply-To: <20230303084343.171958-1-wangkefeng.wang@huawei.com>

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 | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/mm/damon/paddr.c b/mm/damon/paddr.c
index 3fda00a0f786..2ef9db0189ca 100644
--- a/mm/damon/paddr.c
+++ b/mm/damon/paddr.c
@@ -130,24 +130,21 @@ static bool damon_pa_young(unsigned long paddr, unsigned long *folio_sz)
 			accessed = false;
 		else
 			accessed = true;
-		folio_put(folio);
 		goto out;
 	}
 
 	need_lock = !folio_test_anon(folio) || folio_test_ksm(folio);
-	if (need_lock && !folio_trylock(folio)) {
-		folio_put(folio);
-		return false;
-	}
+	if (need_lock && !folio_trylock(folio))
+		goto out;
 
 	rmap_walk(folio, &rwc);
 
 	if (need_lock)
 		folio_unlock(folio);
-	folio_put(folio);
 
-out:
 	*folio_sz = folio_size(folio);
+out:
+	folio_put(folio);
 	return accessed;
 }
 
-- 
2.35.3


  parent reply	other threads:[~2023-03-03  8:22 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-03  8:43 [PATCH v2 0/3] mm/damon/paddr: minor code improvement Kefeng Wang
2023-03-03  8:43 ` [PATCH v2 1/3] mm/damon/paddr: minor refactor of damon_pa_pageout() Kefeng Wang
2023-03-03 18:41   ` SeongJae Park
2023-03-03  8:43 ` Kefeng Wang [this message]
2023-03-03 18:39   ` [PATCH v2 2/3] mm/damon/paddr: minor refactor of damon_pa_young() SeongJae Park
2023-03-06  1:10     ` Kefeng Wang
2023-03-06  1:56       ` Kefeng Wang
2023-03-06 21:27         ` SeongJae Park
2023-03-07  1:22           ` Kefeng Wang
2023-03-07 18:00             ` SeongJae Park
2023-03-08  1:03               ` Kefeng Wang
2023-03-03  8:43 ` [PATCH v2 3/3] mm/damon/paddr: minor refactor of damon_pa_mark_accessed_or_deactivate() Kefeng Wang
2023-03-03 18:26   ` SeongJae Park
2023-03-03 18:37     ` SeongJae Park
2023-03-06  1:12       ` Kefeng Wang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230303084343.171958-3-wangkefeng.wang@huawei.com \
    --to=wangkefeng.wang@huawei.com \
    --cc=akpm@linux-foundation.org \
    --cc=damon@lists.linux.dev \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=sj@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).