aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-10-26 19:19:16 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2014-11-03 15:20:29 -0500
commit946e51f2bf37f1656916eb75bd0742ba33983c28 (patch)
treee3d2672edeec1117ceda1e8e195eaa8d1c0f5135 /kernel/trace/trace.c
parenta7400222e3eb7d5ce3820d2234905bbeafabd171 (diff)
move d_rcu from overlapping d_child to overlapping d_alias
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r--kernel/trace/trace.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 8a528392b1f4..459a7b1251e5 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -6420,7 +6420,7 @@ static int instance_mkdir (struct inode *inode, struct dentry *dentry, umode_t m
6420 int ret; 6420 int ret;
6421 6421
6422 /* Paranoid: Make sure the parent is the "instances" directory */ 6422 /* Paranoid: Make sure the parent is the "instances" directory */
6423 parent = hlist_entry(inode->i_dentry.first, struct dentry, d_alias); 6423 parent = hlist_entry(inode->i_dentry.first, struct dentry, d_u.d_alias);
6424 if (WARN_ON_ONCE(parent != trace_instance_dir)) 6424 if (WARN_ON_ONCE(parent != trace_instance_dir))
6425 return -ENOENT; 6425 return -ENOENT;
6426 6426
@@ -6447,7 +6447,7 @@ static int instance_rmdir(struct inode *inode, struct dentry *dentry)
6447 int ret; 6447 int ret;
6448 6448
6449 /* Paranoid: Make sure the parent is the "instances" directory */ 6449 /* Paranoid: Make sure the parent is the "instances" directory */
6450 parent = hlist_entry(inode->i_dentry.first, struct dentry, d_alias); 6450 parent = hlist_entry(inode->i_dentry.first, struct dentry, d_u.d_alias);
6451 if (WARN_ON_ONCE(parent != trace_instance_dir)) 6451 if (WARN_ON_ONCE(parent != trace_instance_dir))
6452 return -ENOENT; 6452 return -ENOENT;
6453 6453