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 /fs/autofs4/root.c | |
| 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 'fs/autofs4/root.c')
| -rw-r--r-- | fs/autofs4/root.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c index 790fa63..2e936c6 100644 --- a/fs/autofs4/root.c +++ b/fs/autofs4/root.c @@ -651,7 +651,7 @@ static void autofs_clear_leaf_automount_flags(struct dentry *dentry) /* only consider parents below dentrys in the root */ if (IS_ROOT(parent->d_parent)) return; - d_child = &dentry->d_u.d_child; + d_child = &dentry->d_child; /* Set parent managed if it's becoming empty */ if (d_child->next == &parent->d_subdirs && d_child->prev == &parent->d_subdirs) |