From e21031a425e568886b0be8048318ac7ded1616b7 Mon Sep 17 00:00:00 2001
From: Frederic Robra
Date: Fri, 5 Jul 2019 15:32:13 +0200
Subject: fixed some errors with multi queue

---
 src/kernel/dnbd3.h | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'src/kernel/dnbd3.h')

diff --git a/src/kernel/dnbd3.h b/src/kernel/dnbd3.h
index af9bdff..0a4ef67 100644
--- a/src/kernel/dnbd3.h
+++ b/src/kernel/dnbd3.h
@@ -44,7 +44,7 @@ typedef struct
 typedef struct dnbd3_device_t {
 	int minor;
 	struct blk_mq_tag_set tag_set;
-	struct request_queue queue;
+//	struct request_queue queue;
 	struct mutex config_lock;
 	refcount_t config_refs;
 	refcount_t refs;
@@ -67,7 +67,7 @@ typedef struct dnbd3_device_t {
 	dnbd3_server_t alt_servers[NUMBER_SERVERS]; // array of alt servers
 	int new_servers_num;	// number of new alt servers that are waiting to be copied to above array
 	dnbd3_server_entry_t new_servers[NUMBER_SERVERS]; // pending new alt servers
-	uint8_t discover, panic, disconnecting, update_available, panic_count, request;
+	uint8_t discover, panic, disconnecting, update_available, panic_count;
 	uint8_t use_server_provided_alts;
 	uint16_t rid;
 	uint32_t heartbeat_count;
@@ -99,15 +99,12 @@ typedef struct dnbd3_cmd {
 	unsigned long flags;
 	uint32_t cmd_cookie;
 } dnbd3_cmd;
-//
-//typedef struct dnbd3_sock {
-//	struct socket *sock;
-//	struct mutex tx_lock;
-//	struct request *pending;
-//	int sent;
-//	bool dead;
-//	int fallback_index;
-//	int cookie;
-//} dnbd3_sock;
+
+typedef struct dnbd3_sock {
+	struct socket *sock;
+	struct mutex lock;
+	struct request *pending;
+	struct dnbd3_server_t *server;
+} dnbd3_sock;
 
 #endif /* DNBD_H_ */
-- 
cgit v1.2.3-55-g7522