[PATCH] Module use count must be updated as bridges arecreated/destroyed

From: Jan Beulich
Date: Wed Sep 26 2007 - 03:52:27 EST


Otherwise 'modprobe -r' on a module having a dependency on bridge will
implicitly unload bridge, bringing down all connectivity that was using
bridges.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>

net/bridge/br_if.c | 9 +++++++++
1 file changed, 9 insertions(+)

--- linux-2.6.23-rc8/net/bridge/br_if.c 2007-09-26 09:23:54.000000000 +0200
+++ 2.6.23-rc8-bridge-module-get-put/net/bridge/br_if.c 2007-09-25 14:31:01.000000000 +0200
@@ -276,6 +276,11 @@ int br_add_bridge(const char *name)
if (!dev)
return -ENOMEM;

+ if (!try_module_get(THIS_MODULE)) {
+ free_netdev(dev);
+ return -ENOENT;
+ }
+
rtnl_lock();
if (strchr(dev->name, '%')) {
ret = dev_alloc_name(dev, dev->name);
@@ -294,6 +299,8 @@ int br_add_bridge(const char *name)
unregister_netdevice(dev);
out:
rtnl_unlock();
+ if (ret)
+ module_put(THIS_MODULE);
return ret;
}

@@ -321,6 +328,8 @@ int br_del_bridge(const char *name)
del_br(netdev_priv(dev));

rtnl_unlock();
+ if (ret == 0)
+ module_put(THIS_MODULE);
return ret;
}




-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/