Commit 767cc6c5 authored by Miaohe Lin's avatar Miaohe Lin Committed by Linus Torvalds

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.comSigned-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Reviewed-by: default avatarVitaly Wool <vitaly.wool@konsulko.com>
Cc: Hillf Danton <hdanton@sina.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e891f60e
...@@ -253,9 +253,8 @@ static inline void z3fold_page_unlock(struct z3fold_header *zhdr) ...@@ -253,9 +253,8 @@ static inline void z3fold_page_unlock(struct z3fold_header *zhdr)
spin_unlock(&zhdr->page_lock); spin_unlock(&zhdr->page_lock);
} }
/* return locked z3fold page if it's not headless */
static inline struct z3fold_header *__get_z3fold_header(unsigned long handle, static inline struct z3fold_header *get_z3fold_header(unsigned long handle)
bool lock)
{ {
struct z3fold_buddy_slots *slots; struct z3fold_buddy_slots *slots;
struct z3fold_header *zhdr; struct z3fold_header *zhdr;
...@@ -269,13 +268,12 @@ static inline struct z3fold_header *__get_z3fold_header(unsigned long handle, ...@@ -269,13 +268,12 @@ static inline struct z3fold_header *__get_z3fold_header(unsigned long handle,
read_lock(&slots->lock); read_lock(&slots->lock);
addr = *(unsigned long *)handle; addr = *(unsigned long *)handle;
zhdr = (struct z3fold_header *)(addr & PAGE_MASK); zhdr = (struct z3fold_header *)(addr & PAGE_MASK);
if (lock)
locked = z3fold_page_trylock(zhdr); locked = z3fold_page_trylock(zhdr);
read_unlock(&slots->lock); read_unlock(&slots->lock);
if (locked) if (locked)
break; break;
cpu_relax(); cpu_relax();
} while (lock); } while (true);
} else { } else {
zhdr = (struct z3fold_header *)(handle & PAGE_MASK); zhdr = (struct z3fold_header *)(handle & PAGE_MASK);
} }
...@@ -283,18 +281,6 @@ static inline struct z3fold_header *__get_z3fold_header(unsigned long handle, ...@@ -283,18 +281,6 @@ static inline struct z3fold_header *__get_z3fold_header(unsigned long handle,
return zhdr; 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) static inline void put_z3fold_header(struct z3fold_header *zhdr)
{ {
struct page *page = virt_to_page(zhdr); struct page *page = virt_to_page(zhdr);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment