From 79bb581eb0373c717d1ce95e817fd7411b07ff92 Mon Sep 17 00:00:00 2001
From: Johann Latocha
Date: Fri, 10 Feb 2012 23:47:32 +0100
Subject: [SERVER] Config reload fixed

---
 src/kernel/blk.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/kernel/blk.c')

diff --git a/src/kernel/blk.c b/src/kernel/blk.c
index 8a76b0d..4d5b4b5 100644
--- a/src/kernel/blk.c
+++ b/src/kernel/blk.c
@@ -34,6 +34,7 @@ int dnbd3_blk_add_device(dnbd3_device_t *dev, int minor)
     dev->vid = 0;
     dev->rid = 0;
     dev->sock = NULL;
+    dev->num_servers = 0;
     dev->thread_send = NULL;
     dev->thread_receive = NULL;
 
@@ -63,8 +64,6 @@ int dnbd3_blk_add_device(dnbd3_device_t *dev, int minor)
     queue_flag_set_unlocked(QUEUE_FLAG_NONROT, disk->queue);
     dev->disk = disk;
 
-    dev->hb_request.cmd_type = REQ_TYPE_SPECIAL;
-
     add_disk(disk); // must be last
     return 0;
 }
@@ -123,7 +122,9 @@ int dnbd3_blk_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, u
         break;
 
     default:
+        kfree(msg);
         return -1;
+
     }
 
     kfree(msg);
-- 
cgit v1.2.3-55-g7522