| From b443ae6579c740e70a0d2f0fe1163fe118eafbbe Mon Sep 17 00:00:00 2001 |
| From: Veaceslav Falico <vfalico@redhat.com> |
| Date: Tue, 26 Mar 2013 17:43:28 +0100 |
| Subject: bonding: remove already created master sysfs link on failure |
| |
| |
| From: Veaceslav Falico <vfalico@redhat.com> |
| |
| [ 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> |
| --- |
| drivers/net/bonding/bond_sysfs.c | 5 +++++ |
| 1 file changed, 5 insertions(+) |
| |
| --- a/drivers/net/bonding/bond_sysfs.c |
| +++ b/drivers/net/bonding/bond_sysfs.c |
| @@ -183,6 +183,11 @@ int bond_create_slave_symlinks(struct ne |
| 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; |
| |
| } |