From b0ab6881e38f945c19970af2df549973f9c05673 Mon Sep 17 00:00:00 2001
From: sr
Date: Tue, 28 Aug 2012 19:55:38 +0200
Subject: [KERNEL] Add IOCTLs to add and remove servers [KERNEL] Detect dead
 idle connection earlier [KERNEL] Improved debug output

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

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

diff --git a/src/kernel/dnbd3.h b/src/kernel/dnbd3.h
index 7c550e3..6d1bd17 100644
--- a/src/kernel/dnbd3.h
+++ b/src/kernel/dnbd3.h
@@ -53,25 +53,25 @@ typedef struct
     struct kobject kobj;
 
     // network
+    char *imgname;
     struct socket *sock;
     dnbd3_server_t cur_server, initial_server;
     unsigned long cur_rtt;
-    char *imgname;
     serialized_buffer_t payload_buffer;
-    int rid, update_available;
     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
-    int discover, panic, panic_count, disconnecting;
+    uint8_t discover, panic, disconnecting, mode, update_available, panic_count;
+    uint16_t rid, heartbeat_count;
     uint64_t reported_size;
     // server switch
     struct socket *better_sock;
 
     // process
-    struct timer_list hb_timer;
     struct task_struct *thread_send;
     struct task_struct *thread_receive;
     struct task_struct *thread_discover;
+    struct timer_list hb_timer;
     wait_queue_head_t process_queue_send;
     wait_queue_head_t process_queue_receive;
     wait_queue_head_t process_queue_discover;
-- 
cgit v1.2.3-55-g7522