mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 04:01:48 -04:00
Merge branch 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup fixes from Tejun Heo: "Mostly fixes for the fallouts from the recent cgroup core changes. The decoupled nature of cgroup dynamic hierarchy management (hierarchies are created dynamically on mount but may or may not be reused once unmounted depending on remaining usages) led to more ugliness being added to kernfs. Hopefully, this is the last of it" * 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: cpuset: break kernfs active protection in cpuset_write_resmask() cgroup: fix a race between cgroup_mount() and cgroup_kill_sb() kernfs: introduce kernfs_pin_sb() cgroup: fix mount failure in a corner case cpuset,mempolicy: fix sleeping function called from invalid context cgroup: fix broken css_has_online_children()
This commit is contained in:
commit
40f6123737
5 changed files with 100 additions and 11 deletions
|
|
@ -2139,7 +2139,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)
|
||||
|
|
@ -2147,7 +2146,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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue