Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fix

[linux-2.6] / fs / sysfs / group.c

diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c
index b20951c937615fad16fd1ed5c604baed177ae036..52eed2a7a5efbf91061362b11ca54794d22e0c25 100644 (file)
--- a/fs/sysfs/group.c
+++ b/fs/sysfs/group.c
@@ -70,9 +70,11 @@ void sysfs_remove_group(struct kobject * kobj,
 {
        struct dentry * dir;
 
-       if (grp->name)
-               dir = lookup_one_len(grp->name, kobj->dentry,
+       if (grp->name) {
+               dir = lookup_one_len_kern(grp->name, kobj->dentry,
                                strlen(grp->name));
+               BUG_ON(IS_ERR(dir));
+       }
        else
                dir = dget(kobj->dentry);