diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-10-26 19:19:16 -0400 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-01-01 01:27:50 +0000 |
| commit | 026181647a6262f4ba6d60c0847d306ad685468c (patch) | |
| tree | 6254d3a8adc41c4d18c455067d3e8962c0e1b48a /kernel | |
| parent | 060d11323f35afb752a7ba6c5bead732c204de55 (diff) | |
| download | kernel_samsung_smdk4412-026181647a6262f4ba6d60c0847d306ad685468c.zip kernel_samsung_smdk4412-026181647a6262f4ba6d60c0847d306ad685468c.tar.gz kernel_samsung_smdk4412-026181647a6262f4ba6d60c0847d306ad685468c.tar.bz2 | |
move d_rcu from overlapping d_child to overlapping d_alias
commit 946e51f2bf37f1656916eb75bd0742ba33983c28 upstream.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
[bwh: Backported to 3.2:
- Apply name changes in all the different places we use d_alias and d_child
- Move the WARN_ON() in __d_free() to d_free() as we don't have dentry_free()]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cgroup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index ffcf896..eafb6dd 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -881,7 +881,7 @@ static void cgroup_clear_directory(struct dentry *dentry) spin_lock(&dentry->d_lock); node = dentry->d_subdirs.next; while (node != &dentry->d_subdirs) { - struct dentry *d = list_entry(node, struct dentry, d_u.d_child); + struct dentry *d = list_entry(node, struct dentry, d_child); spin_lock_nested(&d->d_lock, DENTRY_D_LOCK_NESTED); list_del_init(node); @@ -915,7 +915,7 @@ static void cgroup_d_remove_dir(struct dentry *dentry) parent = dentry->d_parent; spin_lock(&parent->d_lock); spin_lock_nested(&dentry->d_lock, DENTRY_D_LOCK_NESTED); - list_del_init(&dentry->d_u.d_child); + list_del_init(&dentry->d_child); spin_unlock(&dentry->d_lock); spin_unlock(&parent->d_lock); remove_dir(dentry); |