diff options
| author | Amerigo Wang <amwang@redhat.com> | 2012-08-10 05:24:38 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-15 01:33:30 +0400 |
| commit | 38e6bc185d9544dfad1774b3f8902a0b061aea25 (patch) | |
| tree | 5dc41a28f9dc48095c998dfc0dcf8b970db6e1b5 /drivers/net/bonding | |
| parent | 47be03a28cc6c80e3aa2b3e8ed6d960ff0c5c0af (diff) | |
| download | linux-38e6bc185d9544dfad1774b3f8902a0b061aea25.tar.xz | |
netpoll: make __netpoll_cleanup non-block
Like the previous patch, slave_disable_netpoll() and __netpoll_cleanup()
may be called with read_lock() held too, so we should make them
non-block, by moving the cleanup and kfree() to call_rcu_bh() callbacks.
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 8697136e27c0..e42891683e3b 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1257,9 +1257,7 @@ static inline void slave_disable_netpoll(struct slave *slave) return; slave->np = NULL; - synchronize_rcu_bh(); - __netpoll_cleanup(np); - kfree(np); + __netpoll_free_rcu(np); } static inline bool slave_dev_support_netpoll(struct net_device *slave_dev) { |