From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757302AbaCFABv (ORCPT ); Wed, 5 Mar 2014 19:01:51 -0500 Received: from e8.ny.us.ibm.com ([32.97.182.138]:45639 "EHLO e8.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757169AbaCFABs (ORCPT ); Wed, 5 Mar 2014 19:01:48 -0500 From: Cody P Schafer To: Linux PPC , Greg Kroah-Hartman Cc: LKML , Paul Mackerras , Arnaldo Carvalho de Melo , Ingo Molnar , Benjamin Herrenschmidt , Michael Ellerman , scottwood@freescale.com, Peter Zijlstra , Cody P Schafer Subject: [PATCH v4 01/11] sysfs: create bin_attributes under the requested group Date: Wed, 5 Mar 2014 16:01:00 -0800 Message-Id: <1394064082-6242-2-git-send-email-cody@linux.vnet.ibm.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1394064082-6242-1-git-send-email-cody@linux.vnet.ibm.com> References: <1394064082-6242-1-git-send-email-cody@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14030600-0320-0000-0000-0000029D89FA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Greg Kroah-Hartman --- 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