aboutsummaryrefslogtreecommitdiffstats
path: root/fs/sysfs
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2013-12-11 16:02:55 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-17 11:59:15 -0500
commitbb8b9d095c5c56cce99576cfef0cf9b989f7120d (patch)
tree9cc1ae8c8954de2d0dbb0b0f4c29a411d4716809 /fs/sysfs
parentc637b8acbe079edb477d887041755b489036f146 (diff)
kernfs: add @mode to kernfs_create_dir[_ns]()
sysfs assumed 0755 for all newly created directories and kernfs inherited it. This assumption is unnecessarily restrictive and inconsistent with kernfs_create_file[_ns](). This patch adds @mode parameter to kernfs_create_dir[_ns]() and update uses in sysfs accordingly. Among others, this will be useful for implementations of the planned ->mkdir() method. This patch doesn't introduce any behavior differences. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/sysfs')
-rw-r--r--fs/sysfs/dir.c3
-rw-r--r--fs/sysfs/group.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index aa007401bfc9..ee0d761c3179 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -73,7 +73,8 @@ int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
73 if (!parent) 73 if (!parent)
74 return -ENOENT; 74 return -ENOENT;
75 75
76 kn = kernfs_create_dir_ns(parent, kobject_name(kobj), kobj, ns); 76 kn = kernfs_create_dir_ns(parent, kobject_name(kobj),
77 S_IRWXU | S_IRUGO | S_IXUGO, kobj, ns);
77 if (IS_ERR(kn)) { 78 if (IS_ERR(kn)) {
78 if (PTR_ERR(kn) == -EEXIST) 79 if (PTR_ERR(kn) == -EEXIST)
79 sysfs_warn_dup(parent, kobject_name(kobj)); 80 sysfs_warn_dup(parent, kobject_name(kobj));
diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c
index 4d00d3996477..6b579387c67a 100644
--- a/fs/sysfs/group.c
+++ b/fs/sysfs/group.c
@@ -100,7 +100,8 @@ static int internal_create_group(struct kobject *kobj, int update,
100 return -EINVAL; 100 return -EINVAL;
101 } 101 }
102 if (grp->name) { 102 if (grp->name) {
103 kn = kernfs_create_dir(kobj->sd, grp->name, kobj); 103 kn = kernfs_create_dir(kobj->sd, grp->name,
104 S_IRWXU | S_IRUGO | S_IXUGO, kobj);
104 if (IS_ERR(kn)) { 105 if (IS_ERR(kn)) {
105 if (PTR_ERR(kn) == -EEXIST) 106 if (PTR_ERR(kn) == -EEXIST)
106 sysfs_warn_dup(kobj->sd, grp->name); 107 sysfs_warn_dup(kobj->sd, grp->name);