Resolve coding style issues flagged by the checkpatch.pl script. Specifically: - Fix block comment formatting to keep trailing '*/' on a separate line. - Add missing blank lines after variable declarations. - Remove unnecessary braces {} from single statement blocks. No functional changes are introduced. Signed-off-by: Christos Skarlos --- mm/hugetlb.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 4f6f58bf3db6..3b00e76332ac 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -145,7 +145,8 @@ static inline void unlock_or_release_subpool(struct hugepage_subpool *spool, /* If no pages are used, and no other handles to the subpool * remain, give up any reservations based on minimum size and - * free the subpool */ + * free the subpool + */ spin_unlock_irqrestore(&spool->lock, irq_flags); if (free_subpool) { @@ -3700,6 +3701,7 @@ static void try_to_free_low(struct hstate *h, unsigned long count, for_each_node_mask(i, *nodes_allowed) { struct folio *folio, *next; struct list_head *freel = &h->hugepage_freelists[i]; + list_for_each_entry_safe(folio, next, freel, lru) { if (count >= h->nr_huge_pages) goto out; @@ -4188,9 +4190,9 @@ void __init hugetlb_add_hstate(unsigned int order) struct hstate *h; unsigned long i; - if (size_to_hstate(PAGE_SIZE << order)) { + if (size_to_hstate(PAGE_SIZE << order)) return; - } + BUG_ON(hugetlb_max_hstate >= HUGE_MAX_HSTATE); BUG_ON(order < order_base_2(__NR_USED_SUBPAGE)); WARN_ON(order > MAX_FOLIO_ORDER); @@ -4832,11 +4834,11 @@ static pte_t make_huge_pte(struct vm_area_struct *vma, struct folio *folio, pte_t entry = folio_mk_pte(folio, vma->vm_page_prot); unsigned int shift = huge_page_shift(hstate_vma(vma)); - if (try_mkwrite && (vma->vm_flags & VM_WRITE)) { + if (try_mkwrite && (vma->vm_flags & VM_WRITE)) entry = pte_mkwrite_novma(pte_mkdirty(entry)); - } else { + else entry = pte_wrprotect(entry); - } + entry = pte_mkyoung(entry); entry = arch_make_huge_pte(entry, shift, vma->vm_flags); @@ -4919,6 +4921,7 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src, last_addr_mask = hugetlb_mask_last_page(h); for (addr = src_vma->vm_start; addr < src_vma->vm_end; addr += sz) { spinlock_t *src_ptl, *dst_ptl; + src_pte = hugetlb_walk(src_vma, addr, sz); if (!src_pte) { addr |= last_addr_mask; @@ -6321,6 +6324,7 @@ int hugetlb_mfill_atomic_pte(pte_t *dst_pte, folio = alloc_hugetlb_folio(dst_vma, dst_addr, false); if (IS_ERR(folio)) { pte_t *actual_pte = hugetlb_walk(dst_vma, dst_addr, PMD_SIZE); + if (actual_pte) { ret = -EEXIST; goto out; -- 2.55.0