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/notify/fsnotify.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/notify/fsnotify.c')
-rw-r--r-- | fs/notify/fsnotify.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/notify/fsnotify.c b/fs/notify/fsnotify.c index 79b47cb..f8ea28f 100644 --- a/fs/notify/fsnotify.c +++ b/fs/notify/fsnotify.c @@ -62,14 +62,14 @@ void __fsnotify_update_child_dentry_flags(struct inode *inode) spin_lock(&inode->i_lock); /* run all of the dentries associated with this inode. Since this is a * directory, there damn well better only be one item on this list */ - list_for_each_entry(alias, &inode->i_dentry, d_alias) { + list_for_each_entry(alias, &inode->i_dentry, d_u.d_alias) { struct dentry *child; /* run all of the children of the original inode and fix their * d_flags to indicate parental interest (their parent is the * original inode) */ spin_lock(&alias->d_lock); - list_for_each_entry(child, &alias->d_subdirs, d_u.d_child) { + list_for_each_entry(child, &alias->d_subdirs, d_child) { if (!child->d_inode) continue; |