Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

[mv-sheeva.git] / fs / sysfs / group.c

diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c
index f11ac5ea7021c4b325211b2f7e58b6e29fbbc60c..b20951c937615fad16fd1ed5c604baed177ae036 100644 (file)
--- a/fs/sysfs/group.c
+++ b/fs/sysfs/group.c
@@ -11,7 +11,10 @@
 #include <linux/kobject.h>
 #include <linux/module.h>
 #include <linux/dcache.h>
+#include <linux/namei.h>
 #include <linux/err.h>
+#include <linux/fs.h>
+#include <asm/semaphore.h>
 #include "sysfs.h"
 
 
@@ -68,7 +71,8 @@ void sysfs_remove_group(struct kobject * kobj,
        struct dentry * dir;
 
        if (grp->name)
-               dir = sysfs_get_dentry(kobj->dentry,grp->name);
+               dir = lookup_one_len(grp->name, kobj->dentry,
+                               strlen(grp->name));
        else
                dir = dget(kobj->dentry);