From: Miaohe Lin <linmiaohe@huawei.com>
Date: Thu, 1 Jul 2021 01:50:39 +0000 (-0700)
Subject: mm/z3fold: use release_z3fold_page_locked() to release locked z3fold page
X-Git-Tag: v5.14-rc1~107^2~125
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=28473d91ff7f686d58047ff55f2fa98ab59114a4;p=linux-block.git

mm/z3fold: use release_z3fold_page_locked() to release locked z3fold page

We should use release_z3fold_page_locked() to release z3fold page when
it's locked, although it looks harmless to use release_z3fold_page() now.

Link: https://lkml.kernel.org/r/20210619093151.1492174-7-linmiaohe@huawei.com
Fixes: dcf5aedb24f8 ("z3fold: stricter locking and more careful reclaim")
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Reviewed-by: Vitaly Wool <vitaly.wool@konsulko.com>
Cc: Hillf Danton <hdanton@sina.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/mm/z3fold.c b/mm/z3fold.c
index f34130ff093d..a1bc021434a1 100644
--- a/mm/z3fold.c
+++ b/mm/z3fold.c
@@ -1370,7 +1370,7 @@ static int z3fold_reclaim_page(struct z3fold_pool *pool, unsigned int retries)
 			if (zhdr->foreign_handles ||
 			    test_and_set_bit(PAGE_CLAIMED, &page->private)) {
 				if (kref_put(&zhdr->refcount,
-						release_z3fold_page))
+						release_z3fold_page_locked))
 					atomic64_dec(&pool->pages_nr);
 				else
 					z3fold_page_unlock(zhdr);