From nobody Fri Jun 12 18:35:48 2026 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 626723E4C69 for ; Wed, 13 May 2026 08:57:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=124.126.103.232 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778662672; cv=none; b=WSubEcNiIF1+40SUM/m4093TmhR7ME8y+dOL//AOrCULqIfLOscICjOg+GU5lZ3bANxSf0kEtVcBniz1x22ZWzOl7e8MwhsYQA4owYlu0T0i5S8vY4bgM3b8ehOC4N3ogQ24bHJBI78kWvSLN16BCRA7R8NC3OgeqjepbIfDtMM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778662672; c=relaxed/simple; bh=UkAtwyFs2nkCNcMbKmgt/1LFLM+QrQFo8Vt+qIBx41Q=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=eGGkEgClr4cP0goMC0RD4AEjfEwDpezNA6jcmRBAUrczA+8M+aDHJFPIien51OjQBu28Fkx552vvi9OVJ2PEh0k/cOdgTQ4Oh46OgonBL5w6edxJGsvirTZHB1W9ee6JlTCwFZatfkWYzrlWltyXUkS/ykwMeW4MIJNatCylBkM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn; spf=pass smtp.mailfrom=kylinos.cn; arc=none smtp.client-ip=124.126.103.232 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kylinos.cn X-UUID: ce1744e04ea911f1aa26b74ffac11d73-20260513 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.12,REQID:1a0af6e5-14aa-4661-ac75-30310097707d,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:e7bac3a,CLOUDID:b15cb7841924db0cc70ca54fa9dc3eed,BulkI D:nil,BulkQuantity:0,Recheck:0,SF:102|123|850|898,TC:nil,Content:0|15|50,E DM:-3,IP:nil,URL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA :0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 2,SSN|SDN X-CID-BAS: 2,SSN|SDN,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: ce1744e04ea911f1aa26b74ffac11d73-20260513 X-User: luoliang@kylinos.cn Received: from localhost.localdomain [(10.44.16.150)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA with TLSv1.3 TLS_AES_256_GCM_SHA384 256/256) with ESMTP id 1488196629; Wed, 13 May 2026 16:57:43 +0800 From: luoliang@kylinos.cn To: Ingo Molnar , Peter Zijlstra Cc: Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , K Prateek Nayak , linux-kernel@vger.kernel.org, Liang Luo Subject: [PATCH] sched/core: Combine separate 'else' and 'if' statements Date: Wed, 13 May 2026 16:54:12 +0800 Message-Id: <20260513085412.372535-1-luoliang@kylinos.cn> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Liang Luo 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 Reviewed-by: Valentin Schneider --- kernel/sched/core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index da20fb6ea25a..c2bf0fc6ac97 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3716,8 +3716,7 @@ ttwu_do_activate(struct rq *rq, struct task_struct *p= , int wake_flags, en_flags |=3D ENQUEUE_RQ_SELECTED; if (wake_flags & WF_MIGRATED) en_flags |=3D ENQUEUE_MIGRATED; - else - if (p->in_iowait) { + else if (p->in_iowait) { delayacct_blkio_end(p); atomic_dec(&task_rq(p)->nr_iowait); } -- 2.45.0