Commit 0edf61e5 authored by Miaohe Lin's avatar Miaohe Lin Committed by Linus Torvalds

khugepaged: remove unneeded return value of khugepaged_collapse_pte_mapped_thps()

Patch series "Cleanup and fixup for khugepaged", v2.

This series contains cleanups to remove unneeded return value, use
helper function and so on.  And there is one fix to correct the wrong
result value for trace_mm_collapse_huge_page_isolate().

This patch (of 4):

The return value of khugepaged_collapse_pte_mapped_thps() is never checked
since it's introduced.  We should remove such unneeded return value.

Link: https://lkml.kernel.org/r/20210306032947.35921-1-linmiaohe@huawei.com
Link: https://lkml.kernel.org/r/20210306032947.35921-2-linmiaohe@huawei.comSigned-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Acked-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d4241a04
...@@ -1533,16 +1533,16 @@ void collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr) ...@@ -1533,16 +1533,16 @@ void collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr)
goto drop_hpage; goto drop_hpage;
} }
static int khugepaged_collapse_pte_mapped_thps(struct mm_slot *mm_slot) static void khugepaged_collapse_pte_mapped_thps(struct mm_slot *mm_slot)
{ {
struct mm_struct *mm = mm_slot->mm; struct mm_struct *mm = mm_slot->mm;
int i; int i;
if (likely(mm_slot->nr_pte_mapped_thp == 0)) if (likely(mm_slot->nr_pte_mapped_thp == 0))
return 0; return;
if (!mmap_write_trylock(mm)) if (!mmap_write_trylock(mm))
return -EBUSY; return;
if (unlikely(khugepaged_test_exit(mm))) if (unlikely(khugepaged_test_exit(mm)))
goto out; goto out;
...@@ -1553,7 +1553,6 @@ static int khugepaged_collapse_pte_mapped_thps(struct mm_slot *mm_slot) ...@@ -1553,7 +1553,6 @@ static int khugepaged_collapse_pte_mapped_thps(struct mm_slot *mm_slot)
out: out:
mm_slot->nr_pte_mapped_thp = 0; mm_slot->nr_pte_mapped_thp = 0;
mmap_write_unlock(mm); mmap_write_unlock(mm);
return 0;
} }
static void retract_page_tables(struct address_space *mapping, pgoff_t pgoff) static void retract_page_tables(struct address_space *mapping, pgoff_t pgoff)
...@@ -2057,9 +2056,8 @@ static void khugepaged_scan_file(struct mm_struct *mm, ...@@ -2057,9 +2056,8 @@ static void khugepaged_scan_file(struct mm_struct *mm,
BUILD_BUG(); BUILD_BUG();
} }
static int khugepaged_collapse_pte_mapped_thps(struct mm_slot *mm_slot) static void khugepaged_collapse_pte_mapped_thps(struct mm_slot *mm_slot)
{ {
return 0;
} }
#endif #endif
......
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