]> git.baikalelectronics.ru Git - kernel.git/commitdiff
mm/z3fold: use release_z3fold_page_locked() to release locked z3fold page
authorMiaohe Lin <linmiaohe@huawei.com>
Thu, 1 Jul 2021 01:50:39 +0000 (18:50 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 Jul 2021 03:47:29 +0000 (20:47 -0700)
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: 594060dd2247 ("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>
mm/z3fold.c

index f34130ff093d51106de1aaf442c5f091c4affae8..a1bc021434a10aab35a519c75e435bcba908d5ff 100644 (file)
@@ -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);