diff options
| -rw-r--r-- | kernel/cpuset.c | 8 | ||||
| -rw-r--r-- | mm/mempolicy.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index 1e2c5f025dcf..4346f9a2c9dc 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c @@ -1152,7 +1152,13 @@ done: int current_cpuset_is_being_rebound(void) { - return task_cs(current) == cpuset_being_rebound; + int ret; + + rcu_read_lock(); + ret = task_cs(current) == cpuset_being_rebound; + rcu_read_unlock(); + + return ret; } static int update_relax_domain_level(struct cpuset *cs, s64 val) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 2b5bcc9cc936..c9f7e6f1d1d9 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -1983,7 +1983,6 @@ struct mempolicy *__mpol_dup(struct mempolicy *old) } else *new = *old; - rcu_read_lock(); if (current_cpuset_is_being_rebound()) { nodemask_t mems = cpuset_mems_allowed(current); if (new->flags & MPOL_F_REBINDING) @@ -1991,7 +1990,6 @@ struct mempolicy *__mpol_dup(struct mempolicy *old) else mpol_rebind_policy(new, &mems, MPOL_REBIND_ONCE); } - rcu_read_unlock(); atomic_set(&new->refcnt, 1); return new; } |