AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

bonding: fix error unwind in bonding_store_bonds

Browse Source 
Fixed an error unwind in bonding_store_bonds that didn't release
the locks it held, and consolidated unwinds into a common block at the
end of the function.  Bug reported by Pavel Emelyanov <xemul@openvz.org>,
who provided a different fix.

Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Jay Vosburgh 2008-05-02 17:49:38 -07:00 committed by Jeff Garzik
parent 822973ba79
commit c4ebc66a1a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/bonding/bond_sysfs.c
View File

@ -146,29 +146,29 @@ static ssize_t bonding_store_bonds(struct class *cls, const char *buffer, size_t
": Unable remove bond %s due to open references.\n", ": Unable remove bond %s due to open references.\n",
ifname); ifname);
res = -EPERM; res = -EPERM;
goto out; goto out_unlock;
} }
printk(KERN_INFO DRV_NAME printk(KERN_INFO DRV_NAME
": %s is being deleted...\n", ": %s is being deleted...\n",
bond->dev->name); bond->dev->name);
bond_destroy(bond); bond_destroy(bond);
up_write(&bonding_rwsem); goto out_unlock;
rtnl_unlock();
goto out;
} }
printk(KERN_ERR DRV_NAME printk(KERN_ERR DRV_NAME
": unable to delete non-existent bond %s\n", ifname); ": unable to delete non-existent bond %s\n", ifname);
res = -ENODEV; res = -ENODEV;
up_write(&bonding_rwsem); goto out_unlock;
rtnl_unlock();
goto out;
} }
err_no_cmd: err_no_cmd:
printk(KERN_ERR DRV_NAME printk(KERN_ERR DRV_NAME
": no command found in bonding_masters. Use +ifname or -ifname.\n"); ": no command found in bonding_masters. Use +ifname or -ifname.\n");
res = -EPERM; return -EPERM;
out_unlock:
up_write(&bonding_rwsem);
rtnl_unlock();
/* Always return either count or an error. If you return 0, you'll /* Always return either count or an error. If you return 0, you'll
* get called forever, which is bad. * get called forever, which is bad.