mirror of
https://github.com/torvalds/linux.git
synced 2026-05-31 10:33:41 +02:00
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>
This commit is contained in:
parent
272bd81833
commit
090e0ae303
|
|
@ -336,7 +336,7 @@ static inline void check_insane_mems_config(nodemask_t *nodes)
|
|||
*/
|
||||
static inline void dec_attach_in_progress_locked(struct cpuset *cs)
|
||||
{
|
||||
lockdep_assert_held(&cpuset_mutex);
|
||||
lockdep_assert_cpuset_lock_held();
|
||||
|
||||
cs->attach_in_progress--;
|
||||
if (!cs->attach_in_progress)
|
||||
|
|
@ -899,7 +899,7 @@ void dl_rebuild_rd_accounting(void)
|
|||
int cpu;
|
||||
u64 cookie = ++dl_cookie;
|
||||
|
||||
lockdep_assert_held(&cpuset_mutex);
|
||||
lockdep_assert_cpuset_lock_held();
|
||||
lockdep_assert_cpus_held();
|
||||
lockdep_assert_held(&sched_domains_mutex);
|
||||
|
||||
|
|
@ -950,7 +950,7 @@ void rebuild_sched_domains_locked(void)
|
|||
int i;
|
||||
|
||||
lockdep_assert_cpus_held();
|
||||
lockdep_assert_held(&cpuset_mutex);
|
||||
lockdep_assert_cpuset_lock_held();
|
||||
force_sd_rebuild = false;
|
||||
|
||||
/* Generate domain masks and attrs */
|
||||
|
|
@ -1645,7 +1645,7 @@ static int update_parent_effective_cpumask(struct cpuset *cs, int cmd,
|
|||
int parent_prs = parent->partition_root_state;
|
||||
bool nocpu;
|
||||
|
||||
lockdep_assert_held(&cpuset_mutex);
|
||||
lockdep_assert_cpuset_lock_held();
|
||||
WARN_ON_ONCE(is_remote_partition(cs)); /* For local partition only */
|
||||
|
||||
/*
|
||||
|
|
@ -2213,7 +2213,7 @@ static void update_sibling_cpumasks(struct cpuset *parent, struct cpuset *cs,
|
|||
struct cpuset *sibling;
|
||||
struct cgroup_subsys_state *pos_css;
|
||||
|
||||
lockdep_assert_held(&cpuset_mutex);
|
||||
lockdep_assert_cpuset_lock_held();
|
||||
|
||||
/*
|
||||
* Check all its siblings and call update_cpumasks_hier()
|
||||
|
|
@ -3047,7 +3047,7 @@ static nodemask_t cpuset_attach_nodemask_to;
|
|||
|
||||
static void cpuset_attach_task(struct cpuset *cs, struct task_struct *task)
|
||||
{
|
||||
lockdep_assert_held(&cpuset_mutex);
|
||||
lockdep_assert_cpuset_lock_held();
|
||||
|
||||
if (cs != &top_cpuset)
|
||||
guarantee_active_cpus(task, cpus_attach);
|
||||
|
|
@ -3969,7 +3969,7 @@ static void __cpuset_cpus_allowed_locked(struct task_struct *tsk, struct cpumask
|
|||
*/
|
||||
void cpuset_cpus_allowed_locked(struct task_struct *tsk, struct cpumask *pmask)
|
||||
{
|
||||
lockdep_assert_held(&cpuset_mutex);
|
||||
lockdep_assert_cpuset_lock_held();
|
||||
__cpuset_cpus_allowed_locked(tsk, pmask);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user