From: Liang Luo <luoliang@kylinos.cn>
Date: Mon, 8 Jun 2026 07:18:42 +0000 (+0800)
Subject: sched/core: Combine separate 'else' and 'if' statements
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76124a050ddbc8b252172205ab04f10a83c03a4d;p=thirdparty%2Flinux.git

sched/core: Combine separate 'else' and 'if' statements

The kernel coding style recommends using 'else if' instead of
placing 'if' on a separate line after 'else'. This change makes
the code consistent with the rest of the kernel codebase.

Signed-off-by: Liang Luo <luoliang@kylinos.cn>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://patch.msgid.link/20260608071842.325159-1-luoliang@kylinos.cn
---

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index e745c58671ed5..2f4530eb543f8 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -3816,8 +3816,7 @@ ttwu_do_activate(struct rq *rq, struct task_struct *p, int wake_flags,
 		en_flags |= ENQUEUE_RQ_SELECTED;
 	if (wake_flags & WF_MIGRATED)
 		en_flags |= ENQUEUE_MIGRATED;
-	else
-	if (p->in_iowait) {
+	else if (p->in_iowait) {
 		delayacct_blkio_end(p);
 		atomic_dec(&task_rq(p)->nr_iowait);
 	}