Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a4ddcd9 authored Feb 21, 2014 by dingtianhong Committed by David S. Miller Feb 24, 2014

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>

parent 4335d60e

drivers/net/bonding/bond_main.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -1816,9 +1816,7 @@ static int bond_info_query(struct net_device bond_dev, struct ifbond info)
		info->bond_mode = bond->params.mode;
		info->miimon = bond->params.miimon;

		read_lock(&bond->lock);
		info->num_slaves = bond->slave_cnt;
		read_unlock(&bond->lock);

		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;
		struct slave *slave;

		read_lock(&bond->lock);
		bond_for_each_slave(bond, slave, iter) {
		if (i++ == (int)info->slave_id) {
		res = 0;
		@@ -1841,7 +1838,6 @@ static int bond_slave_info_query(struct net_device bond_dev, struct ifslave in
		break;
		}
		}
		read_unlock(&bond->lock);

		return res;
		}