From: Joshua Hahn <joshua.hahnjy@gmail.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: David Hildenbrand <david@kernel.org>,
Muchun Song <muchun.song@linux.dev>,
Oscar Salvador <osalvador@suse.de>,
linux-kernel@vger.kernel.org, linux-mm@kvack.org
Subject: [PATCH 3/3] mm/hugetlb: Enforce brace style
Date: Thu, 15 Jan 2026 13:14:37 -0500 [thread overview]
Message-ID: <20260115181438.223620-4-joshua.hahnjy@gmail.com> (raw)
In-Reply-To: <20260115181438.223620-1-joshua.hahnjy@gmail.com>
Documentation/process/coding-style.rst explicitly notes that if only one
branch of a conditional statement is a single statement, braces should
be used in both branches. Enforce this in mm/hugetlb.c.
No functional change intended.
Signed-off-by: Joshua Hahn <joshua.hahnjy@gmail.com>
---
mm/hugetlb.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 432a5054ca1d..75f002f18365 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -578,8 +578,9 @@ hugetlb_resv_map_add(struct resv_map *map, struct list_head *rg, long from,
record_hugetlb_cgroup_uncharge_info(cg, h, map, nrg);
list_add(&nrg->link, rg);
coalesce_file_region(map, nrg);
- } else
+ } else {
*regions_needed += 1;
+ }
return to - from;
}
@@ -1247,8 +1248,9 @@ void hugetlb_dup_vma_private(struct vm_area_struct *vma)
if (vma_lock && vma_lock->vma != vma)
vma->vm_private_data = NULL;
- } else
+ } else {
vma->vm_private_data = NULL;
+ }
}
/*
@@ -2076,8 +2078,9 @@ int dissolve_free_hugetlb_folio(struct folio *folio)
h->max_huge_pages++;
goto out;
}
- } else
+ } else {
rc = 0;
+ }
update_and_free_hugetlb_folio(h, folio, false);
return rc;
@@ -2672,11 +2675,13 @@ void restore_reserve_on_error(struct hstate *h, struct vm_area_struct *vma,
* be consumed on a subsequent allocation.
*/
folio_set_hugetlb_restore_reserve(folio);
- } else
+ } else {
/*
* No reservation present, do nothing
*/
vma_end_reservation(h, vma, address);
+
+ }
}
}
@@ -4703,10 +4708,12 @@ static void hugetlb_vm_op_open(struct vm_area_struct *vma)
if (vma_lock->vma != vma) {
vma->vm_private_data = NULL;
hugetlb_vma_lock_alloc(vma);
- } else
+ } else {
pr_warn("HugeTLB: vma_lock already exists in %s.\n", __func__);
- } else
+ }
+ } else {
hugetlb_vma_lock_alloc(vma);
+ }
}
}
--
2.47.3
next prev parent reply other threads:[~2026-01-15 18:14 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-15 18:14 [PATCH 0/3] mm/hugetlb: A fix and some cleanups Joshua Hahn
2026-01-15 18:14 ` [PATCH 1/3] mm/hugetlb: Restore failed global reservations to subpool Joshua Hahn
2026-01-15 19:19 ` Andrew Morton
2026-01-15 19:45 ` Joshua Hahn
2026-01-15 18:14 ` [PATCH 2/3] mm/hugetlb: Remove unnecessary if condition Joshua Hahn
2026-01-15 20:14 ` David Hildenbrand (Red Hat)
2026-01-15 21:10 ` Joshua Hahn
2026-01-15 21:59 ` Andrew Morton
2026-01-15 22:04 ` Joshua Hahn
2026-01-16 1:39 ` SeongJae Park
2026-01-16 16:45 ` Joshua Hahn
2026-01-15 18:14 ` Joshua Hahn [this message]
2026-01-15 20:10 ` [PATCH 3/3] mm/hugetlb: Enforce brace style David Hildenbrand (Red Hat)
2026-01-15 21:14 ` Joshua Hahn
2026-01-15 21:16 ` David Hildenbrand (Red Hat)
2026-01-16 1:54 ` SeongJae Park
2026-01-15 21:57 ` Andrew Morton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260115181438.223620-4-joshua.hahnjy@gmail.com \
--to=joshua.hahnjy@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=david@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=muchun.song@linux.dev \
--cc=osalvador@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox