mm/z3fold: remove unused function handle_to_z3fold_header()

handle_to_z3fold_header() is unused now.  So we can remove it.  As a
result, get_z3fold_header() becomes the only caller of
__get_z3fold_header() and the argument lock is always true.  Therefore we
could further fold the __get_z3fold_header() into get_z3fold_header() with
lock = true.

Link: https://lkml.kernel.org/r/20210619093151.1492174-5-linmiaohe@huawei.com
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 1b790d02f6f1eb23fa244589153c8eb31166743d..9a42172a1bcd4e4ed6374543169ec6d4a47cd52f 100644 (file)
--- a/mm/z3fold.c
+++ b/mm/z3fold.c
@@ -253,9 +253,8 @@ static inline void z3fold_page_unlock(struct z3fold_header *zhdr)
        spin_unlock(&zhdr->page_lock);
 }
 
-
-static inline struct z3fold_header *__get_z3fold_header(unsigned long handle,
-                                                       bool lock)
+/* return locked z3fold page if it's not headless */
+static inline struct z3fold_header *get_z3fold_header(unsigned long handle)
 {
        struct z3fold_buddy_slots *slots;
        struct z3fold_header *zhdr;
@@ -269,13 +268,12 @@ static inline struct z3fold_header *__get_z3fold_header(unsigned long handle,
                        read_lock(&slots->lock);
                        addr = *(unsigned long *)handle;
                        zhdr = (struct z3fold_header *)(addr & PAGE_MASK);
-                       if (lock)
-                               locked = z3fold_page_trylock(zhdr);
+                       locked = z3fold_page_trylock(zhdr);
                        read_unlock(&slots->lock);
                        if (locked)
                                break;
                        cpu_relax();
-               } while (lock);
+               } while (true);
        } else {
                zhdr = (struct z3fold_header *)(handle & PAGE_MASK);
        }
@@ -283,18 +281,6 @@ static inline struct z3fold_header *__get_z3fold_header(unsigned long handle,
        return zhdr;
 }
 
-/* Returns the z3fold page where a given handle is stored */
-static inline struct z3fold_header *handle_to_z3fold_header(unsigned long h)
-{
-       return __get_z3fold_header(h, false);
-}
-
-/* return locked z3fold page if it's not headless */
-static inline struct z3fold_header *get_z3fold_header(unsigned long h)
-{
-       return __get_z3fold_header(h, true);
-}
-
 static inline void put_z3fold_header(struct z3fold_header *zhdr)
 {
        struct page *page = virt_to_page(zhdr);