diff options
author | Tejun Heo <tj@kernel.org> | 2013-12-11 14:11:54 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-11 15:43:48 -0800 |
commit | adc5e8b58f4886d45f79f4ff41a09001a76a6b12 (patch) | |
tree | e77d7c1cb4c7b9fcf236b329cb486750dbaef860 /fs/kernfs/kernfs-internal.h | |
parent | 324a56e16e44baecac3ca799fd216154145c14bf (diff) | |
download | linux-adc5e8b58f4886d45f79f4ff41a09001a76a6b12.tar.gz linux-adc5e8b58f4886d45f79f4ff41a09001a76a6b12.tar.bz2 linux-adc5e8b58f4886d45f79f4ff41a09001a76a6b12.zip |
kernfs: drop s_ prefix from kernfs_node members
kernfs has just been separated out from sysfs and we're already in
full conflict mode. Nothing can make the situation any worse. Let's
take the chance to name things properly.
s_ prefix for kernfs members is used inconsistently and a misnomer
now. It's not like kernfs_node is used widely across the kernel
making the ability to grep for the members particularly useful. Let's
just drop the prefix.
This patch is strictly rename only and doesn't introduce any
functional difference.
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/kernfs/kernfs-internal.h')
-rw-r--r-- | fs/kernfs/kernfs-internal.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/kernfs/kernfs-internal.h b/fs/kernfs/kernfs-internal.h index b7ea76c6fb33..2dbb1cb95e7f 100644 --- a/fs/kernfs/kernfs-internal.h +++ b/fs/kernfs/kernfs-internal.h @@ -39,9 +39,9 @@ struct sysfs_inode_attrs { static inline struct kernfs_root *kernfs_root(struct kernfs_node *kn) { /* if parent exists, it's always a dir; otherwise, @sd is a dir */ - if (kn->s_parent) - kn = kn->s_parent; - return kn->s_dir.root; + if (kn->parent) + kn = kn->parent; + return kn->dir.root; } /* |