Because of the changes made in dcache.h header file, files that use the d_lock field of the dentry structure need to be changed accordingly. All the d_lock's spin_lock() and spin_unlock() calls are replaced by the corresponding d_lock() and d_unlock() calls. There is no change in logic and everything should just work. Signed-off-by: Waiman Long <Waiman.Long@xxxxxx> --- kernel/cgroup.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/cgroup.c b/kernel/cgroup.c index a7c9e6d..8935c05 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -974,11 +974,11 @@ static void cgroup_d_remove_dir(struct dentry *dentry) cgroup_clear_directory(dentry, true, root->subsys_mask); parent = dentry->d_parent; - spin_lock(&parent->d_lock); - spin_lock_nested(&dentry->d_lock, DENTRY_D_LOCK_NESTED); + d_lock(parent); + d_lock_nested(dentry, DENTRY_D_LOCK_NESTED); list_del_init(&dentry->d_u.d_child); - spin_unlock(&dentry->d_lock); - spin_unlock(&parent->d_lock); + d_unlock(dentry); + d_unlock(parent); remove_dir(dentry); } @@ -1783,7 +1783,7 @@ static struct kobject *cgroup_kobj; * Writes path of cgroup into buf. Returns 0 on success, -errno on error. * * We can't generate cgroup path using dentry->d_name, as accessing - * dentry->name must be protected by irq-unsafe dentry->d_lock or parent + * dentry->name must be protected by irq-unsafe d_ret_lock(dentry) or parent * inode's i_mutex, while on the other hand cgroup_path() can be called * with some irq-safe spinlocks held. */ -- 1.7.1 _______________________________________________ Containers mailing list Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linuxfoundation.org/mailman/listinfo/containers
