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

Commit 4e789fc1 authored by dingtianhong's avatar dingtianhong Committed by David S. Miller
Browse files

bonding: remove unwanted lock for bond_option_active_slave_set() 



The bond_option_active_slave_set() is always called in RTNL,
the RTNL could protect bond slave list, so remove the unwanted
bond lock.

Suggested-by: default avatarJay Vosburgh <fubar@us.ibm.com>
Suggested-by: default avatarVeaceslav Falico <vfalico@redhat.com>
Signed-off-by: default avatarDing Tianhong <dingtianhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent be79bd04

drivers/net/bonding/bond_options.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -107,7 +107,6 @@ int bond_option_active_slave_set(struct bonding *bond, 
	}

	}





	block_netpoll_tx();

	block_netpoll_tx();

	read_lock(&bond->lock);

	write_lock_bh(&bond->curr_slave_lock);

	write_lock_bh(&bond->curr_slave_lock);





	/* check to see if we are clearing active */

	/* check to see if we are clearing active */
@@ -142,7 +141,6 @@ int bond_option_active_slave_set(struct bonding *bond, 
	}

	}





	write_unlock_bh(&bond->curr_slave_lock);

	write_unlock_bh(&bond->curr_slave_lock);

	read_unlock(&bond->lock);

	unblock_netpoll_tx();

	unblock_netpoll_tx();

	return ret;

	return ret;

}

}