diff options
| author | Neil Horman <nhorman@tuxdriver.com> | 2010-10-13 16:01:52 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-18 08:32:08 -0700 |
| commit | 3b410a310b48a8e7de3438957635093596ad5ca5 (patch) | |
| tree | 494176f29fb9bb1a6126319a843403a9e850f73e /drivers/net/netconsole.c | |
| parent | 990c3d6f9c4115347659fc2b163907c8c832ae44 (diff) | |
| download | blackbird-obmc-linux-3b410a310b48a8e7de3438957635093596ad5ca5.tar.gz blackbird-obmc-linux-3b410a310b48a8e7de3438957635093596ad5ca5.zip | |
bonding: Fix netconsole to not deadlock on rmmod
Netconsole calls netpoll_cleanup on receipt of a NETDEVICE_UNREGISTER event.
The notifier subsystem calls these event handlers with rtnl_lock held, which
netpoll_cleanup also takes, resulting in deadlock. Fix this by calling the
__netpoll_cleanup interior function instead, and fixing up the additional
pointers.
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/netconsole.c')
| -rw-r--r-- | drivers/net/netconsole.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index ca142c47b2e4..94255f09093d 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -678,7 +678,14 @@ static int netconsole_netdev_event(struct notifier_block *this, strlcpy(nt->np.dev_name, dev->name, IFNAMSIZ); break; case NETDEV_UNREGISTER: - netpoll_cleanup(&nt->np); + /* + * rtnl_lock already held + */ + if (nt->np.dev) { + __netpoll_cleanup(&nt->np); + dev_put(nt->np.dev); + nt->np.dev = NULL; + } /* Fall through */ case NETDEV_GOING_DOWN: case NETDEV_BONDING_DESLAVE: |
