Skip to contentSkip to conversation

mm/hugetlb: remove unused local variable dst_entry in copy_hugetlb_page_range()

PATCH In review Lukas Bulwahn 2 participants 4 messages Aug 22, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mm/hugetlb: remove unused local variable dst_entry in copy_hugetlb_page_range()

Commit a0e4f7b82610 ("mm/hugetlb: make detecting shared pte more reliable") modifies copy_hugetlb_page_range() such that huge_ptep_get(dst_pte) and the local variable dst_entry is not used explicitly in this function.

Remove this unused local variable dst_entry in copy_hugetlb_page_range(). No functional change.

---
 mm/hugetlb.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
mm/hugetlb.c +2 -3
index 9a72499486c1..6c00ba1dde32 100644
@@ -4763,7 +4763,7 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src,
 			    struct vm_area_struct *dst_vma,
 			    struct vm_area_struct *src_vma)
 {
-	pte_t *src_pte, *dst_pte, entry, dst_entry;
+	pte_t *src_pte, *dst_pte, entry;
 	struct page *ptepage;
 	unsigned long addr;
 	bool cow = is_cow_mapping(src_vma->vm_flags);
@@ -4823,7 +4823,6 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src,
 		src_ptl = huge_pte_lockptr(h, src, src_pte);
 		spin_lock_nested(src_ptl, SINGLE_DEPTH_NESTING);
 		entry = huge_ptep_get(src_pte);
-		dst_entry = huge_ptep_get(dst_pte);
 again:
 		if (huge_pte_none(entry)) {
 			/*
@@ -4906,7 +4905,7 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src,
 					restore_reserve_on_error(h, dst_vma, addr,
 								new);
 					put_page(new);
-					/* dst_entry won't change as in child */
+					/* huge_ptep of dst_pte won't change as in child */
 					goto again;
 				}
 				hugetlb_install_page(dst_vma, dst_pte, addr, new);
Signature · 1 line
2.17.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Lukas Bulwahn

Commit a0e4f7b82610 ("mm/hugetlb: make detecting shared pte more reliable") modifies copy_hugetlb_page_range() such that huge_ptep_get(dst_pte) and the local variable dst_entry is not used explicitly in this function.

Remove this unused local variable dst_entry in copy_hugetlb_page_range(). No functional change.

LGTM. Thanks for your patch.

BTW: I will send a v2 of that series soon. So the above commit id might change.

Thanks,
Miaohe Lin

#2 lore raw
Quoted 9 lines · Miaohe Lin
Quoted 7 lines · Lukas Bulwahn

Commit a0e4f7b82610 ("mm/hugetlb: make detecting shared pte more reliable") modifies copy_hugetlb_page_range() such that huge_ptep_get(dst_pte) and the local variable dst_entry is not used explicitly in this function.

Remove this unused local variable dst_entry in copy_hugetlb_page_range(). No functional change.

Quoted 8 lines
Quoted 1 line

LGTM. Thanks for your patch.

BTW: I will send a v2 of that series soon. So the above commit id might change.

Feel free to just squash this code improvement into your next v2 patch.

Lukas

#3 lore raw
Quoted 12 lines · Lukas Bulwahn
Quoted 11 lines · Miaohe Lin
Quoted 8 lines · Lukas Bulwahn

Commit a0e4f7b82610 ("mm/hugetlb: make detecting shared pte more reliable") modifies copy_hugetlb_page_range() such that huge_ptep_get(dst_pte) and the local variable dst_entry is not used explicitly in this function.

Remove this unused local variable dst_entry in copy_hugetlb_page_range(). No functional change.

Quoted 8 lines
Quoted 6 lines

LGTM. Thanks for your patch.

BTW: I will send a v2 of that series soon. So the above commit id might change.

Feel free to just squash this code improvement into your next v2 patch.

Will do it. Thanks for your report and cleanup.

Thanks,
Miaohe Lin

Quoted 4 lines

Lukas
.