openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

bonding: remove no longer needed lock for bond_xxx_info_query() 

The bond_xxx_info_query() was already in RTNL, so no need to use
bond lock to protect the bond slave list, so remove it.

Cc: Jay Vosburgh <fubar@us.ibm.com>
Cc: Veaceslav Falico <vfalico@redhat.com>
Cc: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Ding Tianhong <dingtianhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
dingtianhong 2014-02-21 16:08:54 +08:00 committed by David S. Miller
parent 4335d60e5e
commit 7a4ddcd92e
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/bonding/bond_main.c
View File

@ -1816,9 +1816,7 @@ static int bond_info_query(struct net_device *bond_dev, struct ifbond *info)
info->bond_mode = bond->params.mode; info->bond_mode = bond->params.mode;
info->miimon = bond->params.miimon; info->miimon = bond->params.miimon;
read_lock(&bond->lock);
info->num_slaves = bond->slave_cnt; info->num_slaves = bond->slave_cnt;
read_unlock(&bond->lock);
return 0; return 0;
} }
@ -1830,7 +1828,6 @@ static int bond_slave_info_query(struct net_device *bond_dev, struct ifslave *in
int i = 0, res = -ENODEV; int i = 0, res = -ENODEV;
struct slave *slave; struct slave *slave;
read_lock(&bond->lock);
bond_for_each_slave(bond, slave, iter) { bond_for_each_slave(bond, slave, iter) {
if (i++ == (int)info->slave_id) { if (i++ == (int)info->slave_id) {
res = 0; res = 0;
@ -1841,7 +1838,6 @@ static int bond_slave_info_query(struct net_device *bond_dev, struct ifslave *in
break; break;
} }
} }
read_unlock(&bond->lock);
return res; return res;
} }