summaryrefslogtreecommitdiffstats
path: root/fs/sysfs
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2008-05-14 22:34:16 -0700
committerDavid S. Miller <davem@davemloft.net>2008-05-14 22:34:16 -0700
commit0599ad53fee2d084f9ba26247d7452f06a40d298 (patch)
tree2d31232e6991d507ff60ec6a774eb0b27de7aeca /fs/sysfs
parentdcc997738e538919101d8756f19ca23110b25d8d (diff)
downloadlinux-stable-0599ad53fee2d084f9ba26247d7452f06a40d298.tar.gz
linux-stable-0599ad53fee2d084f9ba26247d7452f06a40d298.tar.bz2
linux-stable-0599ad53fee2d084f9ba26247d7452f06a40d298.zip
sysfs: remove error messages for -EEXIST case
It is possible that the entry in sysfs already exists, one case of this is when a network device is renamed to bonding_masters. Anyway, in this case the proper error path is for device_rename to return an error code, not to generate bogus backtrace and errors. Also, to avoid possible races, the create link should be done before the remove link. This makes a device rename atomic operation like other renames. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/sysfs')
-rw-r--r--fs/sysfs/dir.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index a1c3a1fab7f0..8c0e4b92574f 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -419,12 +419,8 @@ void sysfs_addrm_start(struct sysfs_addrm_cxt *acxt,
*/
int sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd)
{
- if (sysfs_find_dirent(acxt->parent_sd, sd->s_name)) {
- printk(KERN_WARNING "sysfs: duplicate filename '%s' "
- "can not be created\n", sd->s_name);
- WARN_ON(1);
+ if (sysfs_find_dirent(acxt->parent_sd, sd->s_name))
return -EEXIST;
- }
sd->s_parent = sysfs_get(acxt->parent_sd);