[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>

3 files changed, 6 insertions, 9 deletions

diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
index 37976dcf044b..fea2d3ed9cbd 100644
--- a/drivers/connector/connector.c
+++ b/drivers/connector/connector.c
@@ -420,8 +420,7 @@ static int __devinit cn_init(void)
 
         dev->cbdev = cn_queue_alloc_dev("cqueue", dev->nls);
         if (!dev->cbdev) {
-                if (dev->nls->sk_socket)
-                        sock_release(dev->nls->sk_socket);
+                netlink_kernel_release(dev->nls);
                 return -EINVAL;
         }
         
@@ -431,8 +430,7 @@ static int __devinit cn_init(void)
         if (err) {
                 cn_already_initialized = 0;
                 cn_queue_free_dev(dev->cbdev);
-                if (dev->nls->sk_socket)
-                        sock_release(dev->nls->sk_socket);
+                netlink_kernel_release(dev->nls);
                 return -EINVAL;
         }
 
@@ -447,8 +445,7 @@ static void __devexit cn_fini(void)
 
         cn_del_callback(&dev->id);
         cn_queue_free_dev(dev->cbdev);
-        if (dev->nls->sk_socket)
-                sock_release(dev->nls->sk_socket);
+        netlink_kernel_release(dev->nls);
 }
 
 subsys_initcall(cn_init);
diff --git a/drivers/scsi/scsi_netlink.c b/drivers/scsi/scsi_netlink.c
index 3e1591828171..370c78cc1cb5 100644
--- a/drivers/scsi/scsi_netlink.c
+++ b/drivers/scsi/scsi_netlink.c
@@ -164,7 +164,7 @@ void
 scsi_netlink_exit(void)
 {
         if (scsi_nl_sock) {
-                sock_release(scsi_nl_sock->sk_socket);
+                netlink_kernel_release(scsi_nl_sock);
                 netlink_unregister_notifier(&scsi_netlink_notifier);
         }
 
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index ef0e74264880..0d7b4e79415c 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -1558,7 +1558,7 @@ static __init int iscsi_transport_init(void)
         return 0;
 
 release_nls:
-        sock_release(nls->sk_socket);
+        netlink_kernel_release(nls);
 unregister_session_class:
         transport_class_unregister(&iscsi_session_class);
 unregister_conn_class:
@@ -1573,7 +1573,7 @@ unregister_transport_class:
 static void __exit iscsi_transport_exit(void)
 {
         destroy_workqueue(iscsi_eh_timer_workq);
-        sock_release(nls->sk_socket);
+        netlink_kernel_release(nls);
         transport_class_unregister(&iscsi_connection_class);
         transport_class_unregister(&iscsi_session_class);
         transport_class_unregister(&iscsi_host_class);