]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
sysfs: allow creating symlinks from untagged to tagged directories
authorEric W. Biederman <ebiederm@xmission.com>
Wed, 21 Jul 2010 05:12:01 +0000 (22:12 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 26 Jul 2010 19:02:41 +0000 (12:02 -0700)
Supporting symlinks from untagged to tagged directories is reasonable,
and needed to support CONFIG_SYSFS_DEPRECATED.  So don't fail a prior
allowing that case to work.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
fs/sysfs/symlink.c

index 660383321347567a7e9cd4f0e429a1886aca2187..a7ac78f8e67a4b458793d13f67f3263e58328b6b 100644 (file)
@@ -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