From ab54d25161381dcf48d08f235e8f574bec5c07a2 Mon Sep 17 00:00:00 2001
From: Johann Latocha
Date: Mon, 20 Feb 2012 11:51:12 +0100
Subject: [KERNEL] KP on rmmod fixed

---
 src/kernel/blk.c | 10 +---------
 src/kernel/net.c |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/kernel/blk.c b/src/kernel/blk.c
index abb3f48..192c3db 100644
--- a/src/kernel/blk.c
+++ b/src/kernel/blk.c
@@ -74,15 +74,7 @@ int dnbd3_blk_add_device(dnbd3_device_t *dev, int minor)
 
 int dnbd3_blk_del_device(dnbd3_device_t *dev)
 {
-    if (dev->sock)
-    {
-        sock_release(dev->sock);
-        dev->sock = NULL;
-    }
-
-    if (&dev->hb_timer)
-        del_timer(&dev->hb_timer);
-
+	dnbd3_net_disconnect(dev);
     del_gendisk(dev->disk);
     put_disk(dev->disk);
     blk_cleanup_queue(dev->disk->queue);
diff --git a/src/kernel/net.c b/src/kernel/net.c
index 112ebab..9bd6e85 100644
--- a/src/kernel/net.c
+++ b/src/kernel/net.c
@@ -283,7 +283,7 @@ int dnbd3_net_discover(void *data)
             // TODO: take fastest server
             t1 = (start.tv_sec*1000000ull) + start.tv_usec;
             t2 = (end.tv_sec*1000000ull) + end.tv_usec;
-            printk("DEBUG: Server: %s RTT: %llums\n", host,t2 - t1);
+            printk("DEBUG: Server: %s RTT: %lluus\n", host,t2 - t1);
 
             continue;
 
-- 
cgit v1.2.3-55-g7522