summaryrefslogtreecommitdiffstats
path: root/fs/sysfs/group.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2013-11-28 14:54:23 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-11-29 17:41:35 -0800
commita7dc66dfb4c6d6c1d7c14d5106ce467f1dbd4eba (patch)
tree013752fe5b620dd8bda9318bd1156941c5995de3 /fs/sysfs/group.c
parent471bd7b78bd56c580e91e00a0f656ca922ab3b3c (diff)
downloadop-kernel-dev-a7dc66dfb4c6d6c1d7c14d5106ce467f1dbd4eba.zip
op-kernel-dev-a7dc66dfb4c6d6c1d7c14d5106ce467f1dbd4eba.tar.gz
sysfs, kernfs: remove SYSFS_KOBJ_BIN_ATTR
After kernfs_ops and sysfs_dirent->s_attr.size addition, the distinction between SYSFS_KOBJ_BIN_ATTR and SYSFS_KOBJ_ATTR is only necessary while creating files to decide which kernfs_ops to use. Afterwards, they behave exactly the same. This patch removes SYSFS_KOBJ_BIN_ATTR along with sysfs_is_bin(). sysfs_add_file[_mode_ns]() are updated to take bool @is_bin instead of @type. This patch doesn't introduce any behavior changes. This completely isolates the distinction between the two sysfs file types in the sysfs layer proper. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/sysfs/group.c')
-rw-r--r--fs/sysfs/group.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c
index 065689d..9f65cd9 100644
--- a/fs/sysfs/group.c
+++ b/fs/sysfs/group.c
@@ -55,8 +55,7 @@ static int create_files(struct sysfs_dirent *dir_sd, struct kobject *kobj,
if (!mode)
continue;
}
- error = sysfs_add_file_mode_ns(dir_sd, *attr,
- SYSFS_KOBJ_ATTR,
+ error = sysfs_add_file_mode_ns(dir_sd, *attr, false,
(*attr)->mode | mode,
NULL);
if (unlikely(error))
@@ -269,7 +268,7 @@ int sysfs_merge_group(struct kobject *kobj,
return -ENOENT;
for ((i = 0, attr = grp->attrs); *attr && !error; (++i, ++attr))
- error = sysfs_add_file(dir_sd, *attr, SYSFS_KOBJ_ATTR);
+ error = sysfs_add_file(dir_sd, *attr, false);
if (error) {
while (--i >= 0)
kernfs_remove_by_name(dir_sd, (*--attr)->name);
OpenPOWER on IntegriCloud