Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[karo-tx-linux.git] / fs / sysfs / inode.c

diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c
index 1ee18c81df7814949eae2d3d75ccea96cdcf2039..e23f28894a3a304f028209de49f9e1ab979d3a41 100644 (file)
--- a/fs/sysfs/inode.c
+++ b/fs/sysfs/inode.c
@@ -324,8 +324,6 @@ int sysfs_hash_and_remove(struct sysfs_dirent *dir_sd, const void *ns, const cha
        sysfs_addrm_start(&acxt, dir_sd);
 
        sd = sysfs_find_dirent(dir_sd, ns, name);
-       if (sd && (sd->s_ns != ns))
-               sd = NULL;
        if (sd)
                sysfs_remove_one(&acxt, sd);