From eb8eacf25f5668528914c53290d98506fc35deaa Mon Sep 17 00:00:00 2001
From: Frederic Robra
Date: Thu, 11 Jul 2019 13:14:31 +0200
Subject: removed typedefs

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

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

diff --git a/src/kernel/dnbd3.h b/src/kernel/dnbd3.h
index 33f707d..cde94a2 100644
--- a/src/kernel/dnbd3.h
+++ b/src/kernel/dnbd3.h
@@ -36,29 +36,29 @@
 
 extern struct workqueue_struct *dnbd3_wq;
 
-typedef struct dnbd3_server {
+struct dnbd3_server {
 	dnbd3_host_t host;
 	uint64_t rtts[4];		// Last four round trip time measurements in microsecond
 	uint16_t protocol_version;	// dnbd3 protocol version of this server
 	uint8_t failures;			// How many times the server was unreachable
-} dnbd3_server;
+};
 
 
-typedef struct dnbd3_sock {
+struct dnbd3_sock {
 	struct socket *sock;
 	struct mutex lock;
 	struct request *pending;
 	struct dnbd3_server *server;
 	uint32_t heartbeat_count;
 	uint32_t cookie;
-	uint8_t panic, discover, panic_count;
+//	uint8_t panic, discover, panic_count;
 	struct dnbd3_device *device;
 	struct work_struct keepalive;
 	struct timer_list keepalive_timer;
 	struct work_struct receive;
-} dnbd3_sock;
+};
 
-typedef struct dnbd3_device {
+struct dnbd3_device {
 	int minor;
 	struct blk_mq_tag_set tag_set;
 	struct list_head list;
@@ -72,10 +72,10 @@ typedef struct dnbd3_device {
 	struct mutex device_lock;
 
 	// network
-	dnbd3_sock socks[NUMBER_CONNECTIONS];
+	struct dnbd3_sock socks[NUMBER_CONNECTIONS];
 	char *imgname;
-	dnbd3_server initial_server;
-	dnbd3_server alt_servers[NUMBER_SERVERS]; // array of alt servers
+	struct dnbd3_server initial_server;
+	struct dnbd3_server 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 update_available;
@@ -85,10 +85,10 @@ typedef struct dnbd3_device {
 
 	struct work_struct discovery; // if in irq and need to send request
 	struct timer_list discovery_timer;
-} dnbd3_device;
+};
 
 
-typedef struct dnbd3_cmd {
+struct dnbd3_cmd {
 	struct dnbd3_device *dnbd3;
 	struct mutex lock;
 //	int index;
@@ -96,7 +96,7 @@ typedef struct dnbd3_cmd {
 	blk_status_t status;
 	unsigned long flags;
 //	uint32_t cmd_cookie;
-} dnbd3_cmd;
+};
 
 
 #endif /* DNBD_H_ */
-- 
cgit v1.2.3-55-g7522