diff options
Diffstat (limited to 'fs/sysfs')
-rw-r--r-- | fs/sysfs/dir.c | 2 | ||||
-rw-r--r-- | fs/sysfs/file.c | 2 | ||||
-rw-r--r-- | fs/sysfs/symlink.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c index 4a800017558d..aa007401bfc9 100644 --- a/fs/sysfs/dir.c +++ b/fs/sysfs/dir.c | |||
@@ -113,7 +113,7 @@ void sysfs_remove_dir(struct kobject *kobj) | |||
113 | spin_unlock(&sysfs_symlink_target_lock); | 113 | spin_unlock(&sysfs_symlink_target_lock); |
114 | 114 | ||
115 | if (kn) { | 115 | if (kn) { |
116 | WARN_ON_ONCE(sysfs_type(kn) != SYSFS_DIR); | 116 | WARN_ON_ONCE(kernfs_type(kn) != KERNFS_DIR); |
117 | kernfs_remove(kn); | 117 | kernfs_remove(kn); |
118 | } | 118 | } |
119 | } | 119 | } |
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c index fd104b282f81..fe6388fbd154 100644 --- a/fs/sysfs/file.c +++ b/fs/sysfs/file.c | |||
@@ -29,7 +29,7 @@ static const struct sysfs_ops *sysfs_file_ops(struct kernfs_node *kn) | |||
29 | { | 29 | { |
30 | struct kobject *kobj = kn->parent->priv; | 30 | struct kobject *kobj = kn->parent->priv; |
31 | 31 | ||
32 | if (kn->flags & SYSFS_FLAG_LOCKDEP) | 32 | if (kn->flags & KERNFS_LOCKDEP) |
33 | lockdep_assert_held(kn); | 33 | lockdep_assert_held(kn); |
34 | return kobj->ktype ? kobj->ktype->sysfs_ops : NULL; | 34 | return kobj->ktype ? kobj->ktype->sysfs_ops : NULL; |
35 | } | 35 | } |
diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c index 0d48ea911508..aecb15f84557 100644 --- a/fs/sysfs/symlink.c +++ b/fs/sysfs/symlink.c | |||
@@ -183,7 +183,7 @@ int sysfs_rename_link_ns(struct kobject *kobj, struct kobject *targ, | |||
183 | goto out; | 183 | goto out; |
184 | 184 | ||
185 | result = -EINVAL; | 185 | result = -EINVAL; |
186 | if (sysfs_type(kn) != SYSFS_KOBJ_LINK) | 186 | if (kernfs_type(kn) != KERNFS_LINK) |
187 | goto out; | 187 | goto out; |
188 | if (kn->symlink.target_kn->priv != targ) | 188 | if (kn->symlink.target_kn->priv != targ) |
189 | goto out; | 189 | goto out; |