[PATCH -next] sched: Simplify sched_set_rq_online()

From: Yang Yingliang
Date: Wed Aug 28 2024 - 05:09:42 EST


From: Yang Yingliang <yangyingliang@xxxxxxxxxx>

Use guards to simplify sched_set_rq_online()

Signed-off-by: Yang Yingliang <yangyingliang@xxxxxxxxxx>
---
kernel/sched/core.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index a81b5136d4cb..80848f219260 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -7999,26 +7999,20 @@ void set_rq_offline(struct rq *rq)

static inline void sched_set_rq_online(struct rq *rq, int cpu)
{
- struct rq_flags rf;
-
- rq_lock_irqsave(rq, &rf);
+ guard(rq_lock_irqsave)(rq);
if (rq->rd) {
BUG_ON(!cpumask_test_cpu(cpu, rq->rd->span));
set_rq_online(rq);
}
- rq_unlock_irqrestore(rq, &rf);
}

static inline void sched_set_rq_offline(struct rq *rq, int cpu)
{
- struct rq_flags rf;
-
- rq_lock_irqsave(rq, &rf);
+ guard(rq_lock_irqsave)(rq);
if (rq->rd) {
BUG_ON(!cpumask_test_cpu(cpu, rq->rd->span));
set_rq_offline(rq);
}
- rq_unlock_irqrestore(rq, &rf);
}

/*
--
2.33.0