Commit:     969affd276dec81a35a5ad10d4e05e62e93b380b
Parent:     7d640c4a5b36c4733460065db1554da924044511
Author:     Greg Kroah-Hartman <[EMAIL PROTECTED]>
AuthorDate: Thu Feb 7 11:58:54 2008 -0500
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Thu Feb 7 11:31:46 2008 -0800

    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 <[EMAIL PROTECTED]>
    Cc: Tejun Heo <[EMAIL PROTECTED]>
    Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
 fs/sysfs/group.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c
index 0871c3d..4779049 100644
--- a/fs/sysfs/group.c
+++ b/fs/sysfs/group.c
@@ -77,7 +77,12 @@ void sysfs_remove_group(struct kobject * kobj,
        if (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
                sd = sysfs_get(dir_sd);
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to