move d_rcu from overlapping d_child to overlapping d_alias
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
@@ -6420,7 +6420,7 @@ static int instance_mkdir (struct inode *inode, struct dentry *dentry, umode_t m
|
||||
int ret;
|
||||
|
||||
/* Paranoid: Make sure the parent is the "instances" directory */
|
||||
parent = hlist_entry(inode->i_dentry.first, struct dentry, d_alias);
|
||||
parent = hlist_entry(inode->i_dentry.first, struct dentry, d_u.d_alias);
|
||||
if (WARN_ON_ONCE(parent != trace_instance_dir))
|
||||
return -ENOENT;
|
||||
|
||||
@@ -6447,7 +6447,7 @@ static int instance_rmdir(struct inode *inode, struct dentry *dentry)
|
||||
int ret;
|
||||
|
||||
/* Paranoid: Make sure the parent is the "instances" directory */
|
||||
parent = hlist_entry(inode->i_dentry.first, struct dentry, d_alias);
|
||||
parent = hlist_entry(inode->i_dentry.first, struct dentry, d_u.d_alias);
|
||||
if (WARN_ON_ONCE(parent != trace_instance_dir))
|
||||
return -ENOENT;
|
||||
|
||||
|
||||
@@ -461,7 +461,7 @@ static void remove_event_file_dir(struct ftrace_event_file *file)
|
||||
|
||||
if (dir) {
|
||||
spin_lock(&dir->d_lock); /* probably unneeded */
|
||||
list_for_each_entry(child, &dir->d_subdirs, d_u.d_child) {
|
||||
list_for_each_entry(child, &dir->d_subdirs, d_child) {
|
||||
if (child->d_inode) /* probably unneeded */
|
||||
child->d_inode->i_private = NULL;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user