diff options
| author | Veaceslav Falico <vfalico@redhat.com> | 2013-03-26 16:43:28 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-05 16:26:17 (GMT) |
| commit | 8f5a394c32f8137f7ceb46180c775dd2e10da851 (patch) | |
| tree | a0ea305e143169b719793f1a6a27039eeaa0ed3c | |
| parent | 9d7a1a25337ad50e9619685550e0b016ce23ddef (diff) | |
| download | linux-fsl-qoriq-8f5a394c32f8137f7ceb46180c775dd2e10da851.tar.xz | |
bonding: remove already created master sysfs link on failure
[ Upstream commit 9fe16b78ee17579cb4f333534cf7043e94c67024 ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/bonding/bond_sysfs.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c index 1c9e09f..db103e0 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; } |