diff options
author | Denis V. Lunev <den@openvz.org> | 2008-01-28 17:41:19 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:08:07 -0500 |
commit | b7c6ba6eb1234e35a74fb8ba8123232a7b1ba9e4 (patch) | |
tree | 672c08c95229a6ac242ab12a5195dceddb0f3127 /drivers/connector | |
parent | 4f84d82f7a623f8641af2574425c329431ff158f (diff) |
[NETNS]: Consolidate kernel netlink socket destruction.
Create a specific helper for netlink kernel socket disposal. This just
let the code look better and provides a ground for proper disposal
inside a namespace.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Tested-by: Alexey Dobriyan <adobriyan@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/connector')
-rw-r--r-- | drivers/connector/connector.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c index 37976dcf044..fea2d3ed9cb 100644 --- a/drivers/connector/connector.c +++ b/drivers/connector/connector.c | |||
@@ -420,8 +420,7 @@ static int __devinit cn_init(void) | |||
420 | 420 | ||
421 | dev->cbdev = cn_queue_alloc_dev("cqueue", dev->nls); | 421 | dev->cbdev = cn_queue_alloc_dev("cqueue", dev->nls); |
422 | if (!dev->cbdev) { | 422 | if (!dev->cbdev) { |
423 | if (dev->nls->sk_socket) | 423 | netlink_kernel_release(dev->nls); |
424 | sock_release(dev->nls->sk_socket); | ||
425 | return -EINVAL; | 424 | return -EINVAL; |
426 | } | 425 | } |
427 | 426 | ||
@@ -431,8 +430,7 @@ static int __devinit cn_init(void) | |||
431 | if (err) { | 430 | if (err) { |
432 | cn_already_initialized = 0; | 431 | cn_already_initialized = 0; |
433 | cn_queue_free_dev(dev->cbdev); | 432 | cn_queue_free_dev(dev->cbdev); |
434 | if (dev->nls->sk_socket) | 433 | netlink_kernel_release(dev->nls); |
435 | sock_release(dev->nls->sk_socket); | ||
436 | return -EINVAL; | 434 | return -EINVAL; |
437 | } | 435 | } |
438 | 436 | ||
@@ -447,8 +445,7 @@ static void __devexit cn_fini(void) | |||
447 | 445 | ||
448 | cn_del_callback(&dev->id); | 446 | cn_del_callback(&dev->id); |
449 | cn_queue_free_dev(dev->cbdev); | 447 | cn_queue_free_dev(dev->cbdev); |
450 | if (dev->nls->sk_socket) | 448 | netlink_kernel_release(dev->nls); |
451 | sock_release(dev->nls->sk_socket); | ||
452 | } | 449 | } |
453 | 450 | ||
454 | subsys_initcall(cn_init); | 451 | subsys_initcall(cn_init); |