Messages in this thread Patch in this message | | | From | Michael Ellerman <> | Subject | [PATCH] Allow sysfs_remove_group() to be called on non-added groups | Date | Thu, 13 Sep 2007 14:25:38 +1000 (EST) |
| |
It would be nice to be able to do:
for_each_thing(thing) { error = sysfs_create_group(&thing->kobj, attrs); if (error) { for_each_thing(thing) sysfs_remove_group(&thing->kobj, attrs); return error; } }
But there's a BUG_ON() in sysfs_remove_group() which hits if the attributes were never added.
As discussed here ... http://ozlabs.org/pipermail/cbe-oss-dev/2007-July/002774.html
.. we should just return in that case instead of BUG'ing.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au> --- fs/sysfs/group.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c index f318b73..a256775 100644 --- a/fs/sysfs/group.c +++ b/fs/sysfs/group.c @@ -73,7 +73,8 @@ void sysfs_remove_group(struct kobject * kobj, if (grp->name) { sd = sysfs_get_dirent(dir_sd, grp->name); - BUG_ON(!sd); + if (!sd) + return; } else sd = sysfs_get(dir_sd); -- 1.5.1.3.g7a33b - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |