---

yaml --- r: 201276 b: refs/heads/master c: d330021 h: refs/heads/master v: v3
git-mirror · Jul 26, 2010 · 21a87d2 · 21a87d2
1 parent 67159ac
commit 21a87d2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 521d0453547d6195d200176328aaec6c98a7a290
+refs/heads/master: d33002129eee4717a92e320b0b764a784bbcad3a
diff --git a/trunk/fs/sysfs/symlink.c b/trunk/fs/sysfs/symlink.c
@@ -67,7 +67,8 @@ static int sysfs_do_create_link(struct kobject *kobj, struct kobject *target,
 
 	sysfs_addrm_start(&acxt, parent_sd);
 	/* Symlinks must be between directories with the same ns_type */
-	if (ns_type == sysfs_ns_type(sd->s_symlink.target_sd->s_parent)) {
+	if (!ns_type ||
+	    (ns_type == sysfs_ns_type(sd->s_symlink.target_sd->s_parent))) {
 		if (warn)
 			error = sysfs_add_one(&acxt, sd);
 		else