Skip to content

Commit 090e0ae

Browse files
Zhao Mengmenghtejun
authored andcommitted
cpuset: replace direct lockdep_assert_held() with lockdep_assert_cpuset_lock_held()
We already added lockdep_assert_cpuset_lock_held(), use this new function to keep consistency. Signed-off-by: Zhao Mengmeng <zhaomengmeng@kylinos.cn> Signed-off-by: Tejun Heo <tj@kernel.org>
1 parent 272bd81 commit 090e0ae

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

kernel/cgroup/cpuset.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ static inline void check_insane_mems_config(nodemask_t *nodes)
336336
*/
337337
static inline void dec_attach_in_progress_locked(struct cpuset *cs)
338338
{
339-
lockdep_assert_held(&cpuset_mutex);
339+
lockdep_assert_cpuset_lock_held();
340340

341341
cs->attach_in_progress--;
342342
if (!cs->attach_in_progress)
@@ -899,7 +899,7 @@ void dl_rebuild_rd_accounting(void)
899899
int cpu;
900900
u64 cookie = ++dl_cookie;
901901

902-
lockdep_assert_held(&cpuset_mutex);
902+
lockdep_assert_cpuset_lock_held();
903903
lockdep_assert_cpus_held();
904904
lockdep_assert_held(&sched_domains_mutex);
905905

@@ -950,7 +950,7 @@ void rebuild_sched_domains_locked(void)
950950
int i;
951951

952952
lockdep_assert_cpus_held();
953-
lockdep_assert_held(&cpuset_mutex);
953+
lockdep_assert_cpuset_lock_held();
954954
force_sd_rebuild = false;
955955

956956
/* Generate domain masks and attrs */
@@ -1645,7 +1645,7 @@ static int update_parent_effective_cpumask(struct cpuset *cs, int cmd,
16451645
int parent_prs = parent->partition_root_state;
16461646
bool nocpu;
16471647

1648-
lockdep_assert_held(&cpuset_mutex);
1648+
lockdep_assert_cpuset_lock_held();
16491649
WARN_ON_ONCE(is_remote_partition(cs)); /* For local partition only */
16501650

16511651
/*
@@ -2213,7 +2213,7 @@ static void update_sibling_cpumasks(struct cpuset *parent, struct cpuset *cs,
22132213
struct cpuset *sibling;
22142214
struct cgroup_subsys_state *pos_css;
22152215

2216-
lockdep_assert_held(&cpuset_mutex);
2216+
lockdep_assert_cpuset_lock_held();
22172217

22182218
/*
22192219
* Check all its siblings and call update_cpumasks_hier()
@@ -3047,7 +3047,7 @@ static nodemask_t cpuset_attach_nodemask_to;
30473047

30483048
static void cpuset_attach_task(struct cpuset *cs, struct task_struct *task)
30493049
{
3050-
lockdep_assert_held(&cpuset_mutex);
3050+
lockdep_assert_cpuset_lock_held();
30513051

30523052
if (cs != &top_cpuset)
30533053
guarantee_active_cpus(task, cpus_attach);
@@ -3969,7 +3969,7 @@ static void __cpuset_cpus_allowed_locked(struct task_struct *tsk, struct cpumask
39693969
*/
39703970
void cpuset_cpus_allowed_locked(struct task_struct *tsk, struct cpumask *pmask)
39713971
{
3972-
lockdep_assert_held(&cpuset_mutex);
3972+
lockdep_assert_cpuset_lock_held();
39733973
__cpuset_cpus_allowed_locked(tsk, pmask);
39743974
}
39753975

0 commit comments

Comments
 (0)