From d2d4db57b3ca2a0caa64426048b19b54f894a2ce Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Wed, 12 Oct 2011 22:01:34 +0000
Subject: [PATCH] --- yaml --- r: 266871 b: refs/heads/master c:
 23396180a9770df2c6a694bbb689c12bdf792f94 h: refs/heads/master i:   266869:
 932cf774d8ac1167f5e3d9c32ee42c99bb019fce   266867:
 7c77f549666d4bd24cb6beb09d59b1bc2a6592ca   266863:
 bbecfcbe64a68f7bc24f03647e9036edbf294117 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/sysfs/dir.c   | 6 +++---
 trunk/fs/sysfs/inode.c | 2 --
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 8aa67bdcfc98..bd754ffb8456 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c22400ab64d434a00ecbe0c655a16956c902aa8
+refs/heads/master: 23396180a9770df2c6a694bbb689c12bdf792f94
diff --git a/trunk/fs/sysfs/dir.c b/trunk/fs/sysfs/dir.c
index ea9120a830d8..352d26d98c0a 100644
--- a/trunk/fs/sysfs/dir.c
+++ b/trunk/fs/sysfs/dir.c
@@ -543,7 +543,7 @@ struct sysfs_dirent *sysfs_find_dirent(struct sysfs_dirent *parent_sd,
 	struct sysfs_dirent *sd;
 
 	for (sd = parent_sd->s_dir.children; sd; sd = sd->s_sibling) {
-		if (ns && sd->s_ns && (sd->s_ns != ns))
+		if (sd->s_ns != ns)
 			continue;
 		if (!strcmp(sd->s_name, name))
 			return sd;
@@ -885,7 +885,7 @@ static struct sysfs_dirent *sysfs_dir_pos(const void *ns,
 		while (pos && (ino > pos->s_ino))
 			pos = pos->s_sibling;
 	}
-	while (pos && pos->s_ns && pos->s_ns != ns)
+	while (pos && pos->s_ns != ns)
 		pos = pos->s_sibling;
 	return pos;
 }
@@ -896,7 +896,7 @@ static struct sysfs_dirent *sysfs_dir_next_pos(const void *ns,
 	pos = sysfs_dir_pos(ns, parent_sd, ino, pos);
 	if (pos)
 		pos = pos->s_sibling;
-	while (pos && pos->s_ns && pos->s_ns != ns)
+	while (pos && pos->s_ns != ns)
 		pos = pos->s_sibling;
 	return pos;
 }
diff --git a/trunk/fs/sysfs/inode.c b/trunk/fs/sysfs/inode.c
index e3f091a81c72..527f0cca66ee 100644
--- a/trunk/fs/sysfs/inode.c
+++ b/trunk/fs/sysfs/inode.c
@@ -336,8 +336,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);