sysfs: implement sysfs_dirent active reference and immediate disconnect

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

diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c
index 617d10c..7b9a8f1 100644 (file)
--- a/fs/sysfs/inode.c
+++ b/fs/sysfs/inode.c
@@ -277,12 +277,16 @@ int sysfs_hash_and_remove(struct dentry * dir, const char * name)
                if (!strcmp(sd->s_name, name)) {
                        list_del_init(&sd->s_sibling);
                        sysfs_drop_dentry(sd, dir);
-                       sysfs_put(sd);
                        found = 1;
                        break;
                }
        }
        mutex_unlock(&dir->d_inode->i_mutex);
 
-       return found ? 0 : -ENOENT;
+       if (!found)
+               return -ENOENT;
+
+       sysfs_deactivate(sd);
+       sysfs_put(sd);
+       return 0;
 }