[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20130806121142.GP22756@redhat.com>
Date: Tue, 6 Aug 2013 14:11:42 +0200
From: Veaceslav Falico <vfalico@...hat.com>
To: nikolay@...hat.com
Cc: netdev@...r.kernel.org, andy@...yhouse.net, fubar@...ibm.com,
davem@...emloft.net
Subject: Re: [net-next,v2,2/2] bonding: unwind on bond_add_vlan failure
On Tue, Aug 06, 2013 at 12:40:16PM +0200, nikolay@...hat.com wrote:
>From: Nikolay Aleksandrov <Nikolay Aleksandrov nikolay@...hat.com>
>
>In case of bond_add_vlan() failure currently we'll have the vlan's
>refcnt bumped up in all slaves, but it will never go down because it
>failed to get added to the bond, so properly unwind the added vlan if
>bond_add_vlan fails.
>
>Signed-off-by: Nikolay Aleksandrov <nikolay@...hat.com>
Acked-by: Veaceslav Falico <vfalico@...hat.com>
>
>---
>v2: no changes
>
> drivers/net/bonding/bond_main.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
>index 78b0aeb..4264a76 100644
>--- a/drivers/net/bonding/bond_main.c
>+++ b/drivers/net/bonding/bond_main.c
>@@ -455,13 +455,13 @@ static int bond_vlan_rx_add_vid(struct net_device *bond_dev,
> if (res) {
> pr_err("%s: Error: Failed to add vlan id %d\n",
> bond_dev->name, vid);
>- return res;
>+ goto unwind;
> }
>
> return 0;
>
> unwind:
>- /* unwind from head to the slave that failed */
>+ /* unwind from the slave that failed */
> bond_for_each_slave_continue_reverse(bond, slave)
> vlan_vid_del(slave->dev, proto, vid);
>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists