| From a5116d048366d321844069564b85a11c1f4f3d19 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 30 Jun 2021 18:50:39 -0700 |
| Subject: mm/z3fold: use release_z3fold_page_locked() to release locked z3fold |
| page |
| |
| From: Miaohe Lin <linmiaohe@huawei.com> |
| |
| [ Upstream commit 28473d91ff7f686d58047ff55f2fa98ab59114a4 ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| mm/z3fold.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/mm/z3fold.c b/mm/z3fold.c |
| index 636a71c291bf..912ac9a64a15 100644 |
| --- a/mm/z3fold.c |
| +++ b/mm/z3fold.c |
| @@ -1387,7 +1387,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); |
| -- |
| 2.30.2 |
| |
