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 <c...@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---

 Currently in:
 git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git 
driver-core-next
 with commit-id: aabaf4c2050d21d39fe11eec889c508e84d6a328

---

 fs/sysfs/group.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c
index 6b57938..aa04068 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;
                }
-- 
1.9.0

_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

Reply via email to