summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorVeaceslav Falico <vfalico@redhat.com>2013-03-26 17:43:28 +0100
committerDavid S. Miller <davem@davemloft.net>2013-03-26 18:00:02 +0100
commit9fe16b78ee17579cb4f333534cf7043e94c67024 (patch)
treeaaf72d4a6dc1b60b62e6422563da2b98103359cd /drivers/net
parentaf_unix: dont send SCM_CREDENTIAL when dest socket is NULL (diff)
downloadlinux-9fe16b78ee17579cb4f333534cf7043e94c67024.tar.xz
linux-9fe16b78ee17579cb4f333534cf7043e94c67024.zip
bonding: remove already created master sysfs link on failure
If slave sysfs symlink failes to be created - we end up without removing the master sysfs symlink. Remove it in case of failure. Signed-off-by: Veaceslav Falico <vfalico@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/bonding/bond_sysfs.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 1c9e09fbdff8..db103e03ba05 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -183,6 +183,11 @@ int bond_create_slave_symlinks(struct net_device *master,
sprintf(linkname, "slave_%s", slave->name);
ret = sysfs_create_link(&(master->dev.kobj), &(slave->dev.kobj),
linkname);
+
+ /* free the master link created earlier in case of error */
+ if (ret)
+ sysfs_remove_link(&(slave->dev.kobj), "master");
+
return ret;
}