From 67159accd6b84f63e1fc0c13b5e218fcbf0d69eb Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Tue, 20 Jul 2010 22:10:58 -0700
Subject: [PATCH] --- yaml --- r: 201275 b: refs/heads/master c:
 521d0453547d6195d200176328aaec6c98a7a290 h: refs/heads/master i:   201273:
 a488d44d14ae95c80355770f84abe0d533f3520d   201271:
 0491fb1019bccdc4e88abd97d9c66093ceeb5dfc v: v3

---
 [refs]                   | 2 +-
 trunk/fs/sysfs/symlink.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d94cc2e75a72..641b5ead680a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96d6523adffbab64f099561a021892125e0c672c
+refs/heads/master: 521d0453547d6195d200176328aaec6c98a7a290
diff --git a/trunk/fs/sysfs/symlink.c b/trunk/fs/sysfs/symlink.c
index 44bca5f49cd5..660383321347 100644
--- a/trunk/fs/sysfs/symlink.c
+++ b/trunk/fs/sysfs/symlink.c
@@ -135,7 +135,7 @@ void sysfs_delete_link(struct kobject *kobj, struct kobject *targ,
 {
 	const void *ns = NULL;
 	spin_lock(&sysfs_assoc_lock);
-	if (targ->sd)
+	if (targ->sd && sysfs_ns_type(kobj->sd))
 		ns = targ->sd->s_ns;
 	spin_unlock(&sysfs_assoc_lock);
 	sysfs_hash_and_remove(kobj->sd, ns, name);