diff options
| author | Cody P Schafer <cody@linux.vnet.ibm.com> | 2014-02-14 14:02:07 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-15 12:14:55 -0800 |
| commit | aabaf4c2050d21d39fe11eec889c508e84d6a328 (patch) | |
| tree | 2ad5f0618c3667eecbbc4b2de23c7dfbbf52f369 /fs/sysfs | |
| parent | 5c764dfaefc582d9c3e2bbd52ae2e30747af8a37 (diff) | |
| download | linux-stable-aabaf4c2050d21d39fe11eec889c508e84d6a328.tar.gz linux-stable-aabaf4c2050d21d39fe11eec889c508e84d6a328.tar.bz2 linux-stable-aabaf4c2050d21d39fe11eec889c508e84d6a328.zip | |
sysfs: create bin_attributes under the requested group
bin_attributes created/updated in create_files() (such as those listed
via (struct device).attribute_groups) were not placed under the
specified group, and instead appeared in the base kobj directory.
Fix this by making bin_attributes use creating code similar to normal
attributes.
A quick grep shows that no one is using bin_attrs in a named attribute
group yet, so we can do this without breaking anything in usespace.
Note that I do not add is_visible() support to
bin_attributes, though that could be done as well.
Signed-off-by: Cody P Schafer <cody@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/sysfs')
| -rw-r--r-- | fs/sysfs/group.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c index 6b579387c67a..aa0406895b53 100644 --- a/fs/sysfs/group.c +++ b/fs/sysfs/group.c @@ -70,8 +70,11 @@ static int create_files(struct kernfs_node *parent, struct kobject *kobj, if (grp->bin_attrs) { for (bin_attr = grp->bin_attrs; *bin_attr; bin_attr++) { if (update) - sysfs_remove_bin_file(kobj, *bin_attr); - error = sysfs_create_bin_file(kobj, *bin_attr); + kernfs_remove_by_name(parent, + (*bin_attr)->attr.name); + error = sysfs_add_file_mode_ns(parent, + &(*bin_attr)->attr, true, + (*bin_attr)->attr.mode, NULL); if (error) break; } |