Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 5 insertions, 1 deletions

diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index 59734ba1ee..d367803821 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -112,7 +112,11 @@ static int create_dir(struct kobject * k, struct dentry * p,
                         }
                 }
                 if (error && (error != -EEXIST)) {
-                        sysfs_put((*d)->d_fsdata);
+                        struct sysfs_dirent *sd = (*d)->d_fsdata;
+                        if (sd) {
+                                list_del_init(&sd->s_sibling);
+                                sysfs_put(sd);
+                        }
                         d_drop(*d);
                 }
                 dput(*d);