| Message ID | 20220611084731.55155-7-linmiaohe@huawei.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | A few cleanup patches for khugepaged | expand |
On 11 Jun 16:47, Miaohe Lin wrote: > The return value of khugepaged_add_pte_mapped_thp() is always 0 and also > ignored. Remove it to clean up the code. > > Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> > --- > mm/khugepaged.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/mm/khugepaged.c b/mm/khugepaged.c > index 142e26e4bdbf..ee0a719c8be9 100644 > --- a/mm/khugepaged.c > +++ b/mm/khugepaged.c > @@ -1372,7 +1372,7 @@ static void collect_mm_slot(struct mm_slot *mm_slot) > * Notify khugepaged that given addr of the mm is pte-mapped THP. Then > * khugepaged should try to collapse the page table. > */ > -static int khugepaged_add_pte_mapped_thp(struct mm_struct *mm, > +static void khugepaged_add_pte_mapped_thp(struct mm_struct *mm, > unsigned long addr) Since this is a cleanup, should keep the second param aligned with opening bracket to satisfy checkpatch. Otherwise can add Reviewed-by: Zach O'Keefe <zokeefe@google.com> > { > struct mm_slot *mm_slot; > @@ -1384,7 +1384,6 @@ static int khugepaged_add_pte_mapped_thp(struct mm_struct *mm, > if (likely(mm_slot && mm_slot->nr_pte_mapped_thp < MAX_PTE_MAPPED_THP)) > mm_slot->pte_mapped_thp[mm_slot->nr_pte_mapped_thp++] = addr; > spin_unlock(&khugepaged_mm_lock); > - return 0; > } > > static void collapse_and_free_pmd(struct mm_struct *mm, struct vm_area_struct *vma, > -- > 2.23.0 > >
On Sat, Jun 11, 2022 at 1:47 AM Miaohe Lin <linmiaohe@huawei.com> wrote: > > The return value of khugepaged_add_pte_mapped_thp() is always 0 and also > ignored. Remove it to clean up the code. > > Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> Reviewed-by: Yang Shi <shy828301@gmail.com> > --- > mm/khugepaged.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/mm/khugepaged.c b/mm/khugepaged.c > index 142e26e4bdbf..ee0a719c8be9 100644 > --- a/mm/khugepaged.c > +++ b/mm/khugepaged.c > @@ -1372,7 +1372,7 @@ static void collect_mm_slot(struct mm_slot *mm_slot) > * Notify khugepaged that given addr of the mm is pte-mapped THP. Then > * khugepaged should try to collapse the page table. > */ > -static int khugepaged_add_pte_mapped_thp(struct mm_struct *mm, > +static void khugepaged_add_pte_mapped_thp(struct mm_struct *mm, > unsigned long addr) > { > struct mm_slot *mm_slot; > @@ -1384,7 +1384,6 @@ static int khugepaged_add_pte_mapped_thp(struct mm_struct *mm, > if (likely(mm_slot && mm_slot->nr_pte_mapped_thp < MAX_PTE_MAPPED_THP)) > mm_slot->pte_mapped_thp[mm_slot->nr_pte_mapped_thp++] = addr; > spin_unlock(&khugepaged_mm_lock); > - return 0; > } > > static void collapse_and_free_pmd(struct mm_struct *mm, struct vm_area_struct *vma, > -- > 2.23.0 > >
diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 142e26e4bdbf..ee0a719c8be9 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1372,7 +1372,7 @@ static void collect_mm_slot(struct mm_slot *mm_slot) * Notify khugepaged that given addr of the mm is pte-mapped THP. Then * khugepaged should try to collapse the page table. */ -static int khugepaged_add_pte_mapped_thp(struct mm_struct *mm, +static void khugepaged_add_pte_mapped_thp(struct mm_struct *mm, unsigned long addr) { struct mm_slot *mm_slot; @@ -1384,7 +1384,6 @@ static int khugepaged_add_pte_mapped_thp(struct mm_struct *mm, if (likely(mm_slot && mm_slot->nr_pte_mapped_thp < MAX_PTE_MAPPED_THP)) mm_slot->pte_mapped_thp[mm_slot->nr_pte_mapped_thp++] = addr; spin_unlock(&khugepaged_mm_lock); - return 0; } static void collapse_and_free_pmd(struct mm_struct *mm, struct vm_area_struct *vma,
The return value of khugepaged_add_pte_mapped_thp() is always 0 and also ignored. Remove it to clean up the code. Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> --- mm/khugepaged.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)