sysfs: remove BUG_ON() from sysfs_remove_group()

It's possible that the caller of sysfs_remove_group messed up and passed in an attribute group that was not really registered to this kobject.  But don't panic for such a foolish error, spit out a warning about what happened, and continue on our way safely.

Cc: Roland Dreier <rdreier@cisco.com>
Cc: Tejun Heo <htejun@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2008-02-07 11:58:54 -05:00
parent 7d640c4a5b
commit 969affd276

View File

@ -77,7 +77,12 @@ void sysfs_remove_group(struct kobject * kobj,
if (grp->name) { if (grp->name) {
sd = sysfs_get_dirent(dir_sd, grp->name); sd = sysfs_get_dirent(dir_sd, grp->name);
BUG_ON(!sd); if (!sd) {
printk(KERN_WARNING "sysfs group %p not found for "
"kobject '%s'\n", grp, kobject_name(kobj));
WARN_ON(!sd);
return;
}
} else } else
sd = sysfs_get(dir_sd); sd = sysfs_get(dir_sd);