public inbox for netdev@vger.kernel.org 
 help / color / mirror / Atom feed
From: Veaceslav Falico <vfalico@redhat•com>
To: nikolay@redhat•com
Cc: netdev@vger•kernel.org, andy@greyhouse•net, fubar@us•ibm.com,
	davem@davemloft•net
Subject: Re: [net-next,v2,2/2] bonding: unwind on bond_add_vlan failure
Date: Tue, 6 Aug 2013 14:11:42 +0200	[thread overview]
Message-ID: <20130806121142.GP22756@redhat.com> (raw)
In-Reply-To: <1375785616-5349-3-git-send-email-nikolay@redhat.com>

On Tue, Aug 06, 2013 at 12:40:16PM +0200, nikolay@redhat•com wrote:
>From: Nikolay Aleksandrov <Nikolay Aleksandrov nikolay@redhat•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@redhat•com>

Acked-by: Veaceslav Falico <vfalico@redhat•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);
>

  reply	other threads:[~2013-08-06 12:12 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-06 10:40 [PATCH net-next v2 0/2] bonding: vlan handling changes Nikolay Aleksandrov
2013-08-06 10:40 ` [PATCH net-next v2 1/2] bonding: change the bond's vlan syncing functions with the standard ones Nikolay Aleksandrov
2013-08-06 12:11   ` [net-next, v2, " Veaceslav Falico
2013-08-06 10:40 ` [PATCH net-next v2 2/2] bonding: unwind on bond_add_vlan failure Nikolay Aleksandrov
2013-08-06 12:11   ` Veaceslav Falico [this message]
2013-08-09  5:32 ` [PATCH net-next v2 0/2] bonding: vlan handling changes David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130806121142.GP22756@redhat.com \
    --to=vfalico@redhat$(echo .)com \
    --cc=andy@greyhouse$(echo .)net \
    --cc=davem@davemloft$(echo .)net \
    --cc=fubar@us$(echo .)ibm.com \
    --cc=netdev@vger$(echo .)kernel.org \
    --cc=nikolay@redhat$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox