diff options
author | David Howells <dhowells@redhat.com> | 2015-03-17 18:26:16 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-15 15:06:55 -0400 |
commit | 7682c918439d42291df0d76b3e06627f27fbcdef (patch) | |
tree | 792147ca93d5d36cdf59aa0860920a133434aec4 /kernel/trace/trace.c | |
parent | 3b362157b2162719145d4f3d4f534357d89b45ce (diff) |
VFS: kernel/: d_inode() annotations
relayfs and tracefs are dealing with inodes of their own;
those two act as filesystem drivers
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r-- | kernel/trace/trace.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 62c6506d663f..d44901bcd867 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
@@ -5846,7 +5846,7 @@ trace_create_cpu_file(const char *name, umode_t mode, struct dentry *parent, | |||
5846 | struct dentry *ret = trace_create_file(name, mode, parent, data, fops); | 5846 | struct dentry *ret = trace_create_file(name, mode, parent, data, fops); |
5847 | 5847 | ||
5848 | if (ret) /* See tracing_get_cpu() */ | 5848 | if (ret) /* See tracing_get_cpu() */ |
5849 | ret->d_inode->i_cdev = (void *)(cpu + 1); | 5849 | d_inode(ret)->i_cdev = (void *)(cpu + 1); |
5850 | return ret; | 5850 | return ret; |
5851 | } | 5851 | } |
5852 | 5852 | ||
@@ -6420,7 +6420,7 @@ static int instance_rmdir(struct inode *inode, struct dentry *dentry) | |||
6420 | return -ENOENT; | 6420 | return -ENOENT; |
6421 | 6421 | ||
6422 | /* The caller did a dget() on dentry */ | 6422 | /* The caller did a dget() on dentry */ |
6423 | mutex_unlock(&dentry->d_inode->i_mutex); | 6423 | mutex_unlock(&d_inode(dentry)->i_mutex); |
6424 | 6424 | ||
6425 | /* | 6425 | /* |
6426 | * The inode mutex is locked, but debugfs_create_dir() will also | 6426 | * The inode mutex is locked, but debugfs_create_dir() will also |
@@ -6435,7 +6435,7 @@ static int instance_rmdir(struct inode *inode, struct dentry *dentry) | |||
6435 | ret = instance_delete(dentry->d_iname); | 6435 | ret = instance_delete(dentry->d_iname); |
6436 | 6436 | ||
6437 | mutex_lock_nested(&inode->i_mutex, I_MUTEX_PARENT); | 6437 | mutex_lock_nested(&inode->i_mutex, I_MUTEX_PARENT); |
6438 | mutex_lock(&dentry->d_inode->i_mutex); | 6438 | mutex_lock(&d_inode(dentry)->i_mutex); |
6439 | 6439 | ||
6440 | return ret; | 6440 | return ret; |
6441 | } | 6441 | } |
@@ -6453,7 +6453,7 @@ static __init void create_trace_instances(struct dentry *d_tracer) | |||
6453 | return; | 6453 | return; |
6454 | 6454 | ||
6455 | /* Hijack the dir inode operations, to allow mkdir */ | 6455 | /* Hijack the dir inode operations, to allow mkdir */ |
6456 | trace_instance_dir->d_inode->i_op = &instance_dir_inode_operations; | 6456 | d_inode(trace_instance_dir)->i_op = &instance_dir_inode_operations; |
6457 | } | 6457 | } |
6458 | 6458 | ||
6459 | static void | 6459 | static void |