From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f177.google.com (mail-yw1-f177.google.com [209.85.128.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AF2A8348879 for ; Fri, 16 Jan 2026 19:27:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768591642; cv=none; b=egnnWfpyKFUEFtvR4i0Nj0O7x6BeqgSEqDbPeTzj4JRzk6BnPVbor0xJic8Y6xqCkml8cfOX8+4SrJhDZKlY65QlvQDGEkBgn3U2WN+5S7SGl2ZZiMLWxVPwvUspNEN1cI25RuvnRzunxOw7+VJZ0y451XhuRHFQ05StpDJ0yy0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768591642; c=relaxed/simple; bh=bKqrjlRCEhdxmL9H84Hwcxg7f+le7Vaoi9W+5WKRZuw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TsB3tkAgUotxxVMq9H44JH4XFkvYXxYDNip15OCSHis7ZVFALSfPwrvkI9njNJKIqrepkv1IFSOyJoT16RhY4KPl1BN7y+zczrqkzDi+V/GnmCbGQalorjWmfR5DU/jySWk6dlg0teifqf/ZHLv81g7fIYkeXv+rk1y8Dyhy+34= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=WZe4w8ib; arc=none smtp.client-ip=209.85.128.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WZe4w8ib" Received: by mail-yw1-f177.google.com with SMTP id 00721157ae682-7927b1620ddso36714447b3.0 for ; Fri, 16 Jan 2026 11:27:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768591640; x=1769196440; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bOlQeIx1ss450mypUxbZbc6V89e6K7jSrfpMzB6xtko=; b=WZe4w8ibHMW6Er5NerZJUusHY29VJkiJ3g5ubEqz/rOTXueixRPIt4I86VAck0G40R xyxKVWy+NUjpu+3dVVzerCBP04TnDq2aCeRmUrXhXIRRLiEA6g5FYdZTMpFXd9fcPYdt smGsk6l71swdh7/oeT3g7Dm7w1rvy7kCGpe4RWMWNOwrWcfG5OuHNf9k/y+RO9ua5ifD PGGjV3bXI4ztFCdTnSev6O7Mwlkz2sRN/xsSmmTwx1U9/28WQY1QmS/iyKcPakg8MlRs ETb5w2ouE5F6rRGuefG+g/4dRf+MXwFzn+lQHgBvBAn/HpM9bRFxiNVsjyFAGq0b8B7i kzrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768591640; x=1769196440; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=bOlQeIx1ss450mypUxbZbc6V89e6K7jSrfpMzB6xtko=; b=ZoBgky5o6Uke2rEomRTooi+NHzPpnJ2uYBJIkajoUBAPJAPaL0IPEpN+oWwMQkLNu6 rQRJdYQiwC9GNxZnJ+DGU61a0OdGh83Ivu4nDolE7LeVr/oemlq1GSuJJpeUhgrspLkl 74RMLz3QKDM4mkoOTF1or8HqnDca0eKB788ByJt2yyeDyMjjZY1sg3Ow4TFNmNOfXRj7 9qLhpK5FfpUC9akqpK4YPNp6mbXIWVEFKk28iWsEvLwbwPcsfv8+EUqRlJOwjwLXyG30 /YcF4QvA6NMTwq9+cHOjqC+UDI7mRQbLEV1FboVsgACZbShAWAuXGP60CfaBO41iBDYi t3Sg== X-Forwarded-Encrypted: i=1; AJvYcCVDGMTOa0iWc+zrk9cAk88Ew8gPmztA28Is1bSEKjSPyFS4CNL5UPY00cTARjggW2oaE0a5eCjJt+Gi7uY=@vger.kernel.org X-Gm-Message-State: AOJu0Yziqu2x3vwQNKHugN6GNjochSbdpHP/Jdq2efDjJbwWmus4g14O mJcqgr+5EX5shI0cR1jF78BLHl4eQ9buYBiN4o71hcNG+e9/aOD92fSUuEhxfw== X-Gm-Gg: AY/fxX6MUZPt6kDRlO8BCt2Z3i5bCs+HGNodB1FOZOxCZyCFUjyC7CjPEZlKkV2heWO 2nHY6i/q6pZ2YX0XXzZybGvf4yyKlac4jQ/H2p3o9EDPkFLRL4lQ4qyCW/mhs31yEHCbXMT4pQv yH+bfYZ29taKXPohPrNbhC9wkC6QuLEryRm9v9A9KF6ZrSyex+EmC1NKbTNoN6ZDZI+8X0SE5EJ NL/oBEdvqL2LpugenHEwxc88kvhJrzx5sUSF9/SqlaPfphh/x+A4gBakomXP44J3ikQenFiCqds I/uUU2EE3QHjv7fdH5MrPgaRqj7ZC4iH+xsTkVsehB/VVoZrwGzUaC/Ut1ktMXHGrk8vguQXzes w4+ay9OwN3o8Zn+66V8ocdPM3a/okgvz3urQaFfbiyrCuB5X+KPeXBpkYMZRJzDIx7OvRLt4flQ iNQ9UQ5AdJwZdPQB8bnQgj X-Received: by 2002:a05:690c:620e:b0:792:8604:f0ea with SMTP id 00721157ae682-793c58b231cmr31290047b3.18.1768591639714; Fri, 16 Jan 2026 11:27:19 -0800 (PST) Received: from localhost ([2a03:2880:25ff:43::]) by smtp.gmail.com with ESMTPSA id 00721157ae682-793c66f66cbsm12374977b3.13.2026.01.16.11.27.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Jan 2026 11:27:19 -0800 (PST) From: Joshua Hahn To: Andrew Morton Cc: David Hildenbrand , Muchun Song , Oscar Salvador , linux-kernel@vger.kernel.org, linux-mm@kvack.org, kernel-team@meta.com Subject: [PATCH v2 2/2] mm/hugetlb: Enforce brace style Date: Fri, 16 Jan 2026 14:27:16 -0500 Message-ID: <20260116192717.1600049-2-joshua.hahnjy@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260116192717.1600049-1-joshua.hahnjy@gmail.com> References: <20260116192717.1600049-1-joshua.hahnjy@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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. While add it, fix the indentation for vma_end_reservation. No functional change intended. Acked-by: David Hildenbrand (Red Hat) Reviewed-by: SeongJae Park Signed-off-by: Joshua Hahn --- v1 --> v2: - Remove accidental newline, noted by Andrew and David. - Fix vma_end_reservation's indentation while at it, as suggested by SeongJae. mm/hugetlb.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 2e5592c5cbb2..120ebd448b42 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,12 @@ 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); + vma_end_reservation(h, vma, address); + } } } @@ -4711,10 +4715,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