Pull mem-attribute into release branch

[powerpc.git] / fs / sysfs / group.c

diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c
index 122145b..52eed2a 100644 (file)
--- a/fs/sysfs/group.c
+++ b/fs/sysfs/group.c
@@ -13,6 +13,8 @@
 #include <linux/dcache.h>
 #include <linux/namei.h>
 #include <linux/err.h>
+#include <linux/fs.h>
+#include <asm/semaphore.h>
 #include "sysfs.h"
 
 
@@ -68,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);