From 83c80e33b2ad1ecc37e5fb637c411fbb33371a81 Mon Sep 17 00:00:00 2001
From: Johann Latocha
Date: Mon, 30 Jan 2012 21:57:52 +0100
Subject: [SERVER] Timeout for client sockets [KERNEL] Send keep alive

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

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

diff --git a/src/kernel/blk.c b/src/kernel/blk.c
index c495205..fe66e1d 100644
--- a/src/kernel/blk.c
+++ b/src/kernel/blk.c
@@ -57,6 +57,8 @@ int dnbd3_blk_add_device(struct dnbd3_device *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;
 }
@@ -69,6 +71,9 @@ int dnbd3_blk_del_device(struct dnbd3_device *dev)
 		dev->sock = NULL;
 	}
 
+	if (&dev->hb_timer)
+		del_timer(&dev->hb_timer);
+
 	del_gendisk(dev->disk);
 	put_disk(dev->disk);
 	blk_cleanup_queue(dev->disk->queue);
-- 
cgit v1.2.3-55-g7522