aboutsummaryrefslogtreecommitdiffstats
path: root/fs/sysfs/symlink.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2010-03-30 14:31:26 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-21 12:37:31 -0400
commit3ff195b011d7decf501a4d55aeed312731094796 (patch)
tree8cfdc330abbf82893955f2d7d6e96efee81bfd7c /fs/sysfs/symlink.c
parentbc451f2058238013e1cdf4acd443c01734d332f0 (diff)
sysfs: Implement sysfs tagged directory support.
The problem. When implementing a network namespace I need to be able to have multiple network devices with the same name. Currently this is a problem for /sys/class/net/*, /sys/devices/virtual/net/*, and potentially a few other directories of the form /sys/ ... /net/*. What this patch does is to add an additional tag field to the sysfs dirent structure. For directories that should show different contents depending on the context such as /sys/class/net/, and /sys/devices/virtual/net/ this tag field is used to specify the context in which those directories should be visible. Effectively this is the same as creating multiple distinct directories with the same name but internally to sysfs the result is nicer. I am calling the concept of a single directory that looks like multiple directories all at the same path in the filesystem tagged directories. For the networking namespace the set of directories whose contents I need to filter with tags can depend on the presence or absence of hotplug hardware or which modules are currently loaded. Which means I need a simple race free way to setup those directories as tagged. To achieve a reace free design all tagged directories are created and managed by sysfs itself. Users of this interface: - define a type in the sysfs_tag_type enumeration. - call sysfs_register_ns_types with the type and it's operations - sysfs_exit_ns when an individual tag is no longer valid - Implement mount_ns() which returns the ns of the calling process so we can attach it to a sysfs superblock. - Implement ktype.namespace() which returns the ns of a syfs kobject. Everything else is left up to sysfs and the driver layer. For the network namespace mount_ns and namespace() are essentially one line functions, and look to remain that. Tags are currently represented a const void * pointers as that is both generic, prevides enough information for equality comparisons, and is trivial to create for current users, as it is just the existing namespace pointer. The work needed in sysfs is more extensive. At each directory or symlink creating I need to check if the directory it is being created in is a tagged directory and if so generate the appropriate tag to place on the sysfs_dirent. Likewise at each symlink or directory removal I need to check if the sysfs directory it is being removed from is a tagged directory and if so figure out which tag goes along with the name I am deleting. Currently only directories which hold kobjects, and symlinks are supported. There is not enough information in the current file attribute interfaces to give us anything to discriminate on which makes it useless, and there are no potential users which makes it an uninteresting problem to solve. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Benjamin Thery <benjamin.thery@bull.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs/sysfs/symlink.c')
-rw-r--r--fs/sysfs/symlink.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
index 942f239a2132..b6ebdaa00f37 100644
--- a/fs/sysfs/symlink.c
+++ b/fs/sysfs/symlink.c
@@ -58,6 +58,8 @@ static int sysfs_do_create_link(struct kobject *kobj, struct kobject *target,
58 if (!sd) 58 if (!sd)
59 goto out_put; 59 goto out_put;
60 60
61 if (sysfs_ns_type(parent_sd))
62 sd->s_ns = target->ktype->namespace(target);
61 sd->s_symlink.target_sd = target_sd; 63 sd->s_symlink.target_sd = target_sd;
62 target_sd = NULL; /* reference is now owned by the symlink */ 64 target_sd = NULL; /* reference is now owned by the symlink */
63 65
@@ -121,7 +123,7 @@ void sysfs_remove_link(struct kobject * kobj, const char * name)
121 else 123 else
122 parent_sd = kobj->sd; 124 parent_sd = kobj->sd;
123 125
124 sysfs_hash_and_remove(parent_sd, name); 126 sysfs_hash_and_remove(parent_sd, NULL, name);
125} 127}
126 128
127/** 129/**
@@ -137,6 +139,7 @@ int sysfs_rename_link(struct kobject *kobj, struct kobject *targ,
137 const char *old, const char *new) 139 const char *old, const char *new)
138{ 140{
139 struct sysfs_dirent *parent_sd, *sd = NULL; 141 struct sysfs_dirent *parent_sd, *sd = NULL;
142 const void *old_ns = NULL, *new_ns = NULL;
140 int result; 143 int result;
141 144
142 if (!kobj) 145 if (!kobj)
@@ -144,8 +147,11 @@ int sysfs_rename_link(struct kobject *kobj, struct kobject *targ,
144 else 147 else
145 parent_sd = kobj->sd; 148 parent_sd = kobj->sd;
146 149
150 if (targ->sd)
151 old_ns = targ->sd->s_ns;
152
147 result = -ENOENT; 153 result = -ENOENT;
148 sd = sysfs_get_dirent(parent_sd, old); 154 sd = sysfs_get_dirent(parent_sd, old_ns, old);
149 if (!sd) 155 if (!sd)
150 goto out; 156 goto out;
151 157
@@ -155,7 +161,10 @@ int sysfs_rename_link(struct kobject *kobj, struct kobject *targ,
155 if (sd->s_symlink.target_sd->s_dir.kobj != targ) 161 if (sd->s_symlink.target_sd->s_dir.kobj != targ)
156 goto out; 162 goto out;
157 163
158 result = sysfs_rename(sd, parent_sd, new); 164 if (sysfs_ns_type(parent_sd))
165 new_ns = targ->ktype->namespace(targ);
166
167 result = sysfs_rename(sd, parent_sd, new_ns, new);
159 168
160out: 169out:
161 sysfs_put(sd); 170 sysfs_put(sd);