[ALL] Some refactoring

6 files changed, 20 insertions, 20 deletions

diff --git a/src/kernel/blk.c b/src/kernel/blk.c
index 7a61ba3..ccc45dc 100644
--- a/src/kernel/blk.c
+++ b/src/kernel/blk.c
@@ -21,7 +21,7 @@
 #include "blk.h"
 #include "net.h"
 
-int dnbd3_blk_add_device(struct dnbd3_device *dev, int minor)
+int dnbd3_blk_add_device(dnbd3_device_t *dev, int minor)
 {
     struct gendisk *disk;
     struct request_queue *blk_queue;
@@ -63,7 +63,7 @@ int dnbd3_blk_add_device(struct dnbd3_device *dev, int minor)
     return 0;
 }
 
-int dnbd3_blk_del_device(struct dnbd3_device *dev)
+int dnbd3_blk_del_device(dnbd3_device_t *dev)
 {
     if (dev->sock)
     {
@@ -85,7 +85,7 @@ struct block_device_operations dnbd3_blk_ops =
 
 int dnbd3_blk_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, unsigned long arg)
 {
-    struct dnbd3_device *lo = bdev->bd_disk->private_data;
+    dnbd3_device_t *lo = bdev->bd_disk->private_data;
 
     switch (cmd)
     {
@@ -121,7 +121,7 @@ int dnbd3_blk_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, u
 void dnbd3_blk_request(struct request_queue *q)
 {
     struct request *req;
-    struct dnbd3_device *lo;
+    dnbd3_device_t *lo;
 
     while ((req = blk_fetch_request(q)) != NULL)
     {
diff --git a/src/kernel/blk.h b/src/kernel/blk.h
index 039d991..bf5ad80 100644
--- a/src/kernel/blk.h
+++ b/src/kernel/blk.h
@@ -29,8 +29,8 @@ int dnbd3_blk_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, u
 
 void dnbd3_blk_request(struct request_queue *q);
 
-int dnbd3_blk_add_device(struct dnbd3_device *dev, int minor);
+int dnbd3_blk_add_device(dnbd3_device_t *dev, int minor);
 
-int dnbd3_blk_del_device(struct dnbd3_device *dev);
+int dnbd3_blk_del_device(dnbd3_device_t *dev);
 
 #endif /* BLK_H_ */
diff --git a/src/kernel/core.c b/src/kernel/core.c
index 6b50aaa..0e81fdd 100644
--- a/src/kernel/core.c
+++ b/src/kernel/core.c
@@ -22,7 +22,7 @@
 #include "blk.h"
 
 int major;
-struct dnbd3_device dnbd3_device[MAX_NUMBER_DEVICES];
+dnbd3_device_t dnbd3_device[MAX_NUMBER_DEVICES];
 
 static int __init dnbd3_init(void)
 {
diff --git a/src/kernel/dnbd3.h b/src/kernel/dnbd3.h
index ec9dd6e..13af803 100644
--- a/src/kernel/dnbd3.h
+++ b/src/kernel/dnbd3.h
@@ -31,7 +31,7 @@
 
 extern int major;
 
-struct dnbd3_device
+typedef struct
 {
     // block
     struct gendisk *disk;
@@ -53,6 +53,6 @@ struct dnbd3_device
     struct list_head request_queue_send;
     struct list_head request_queue_receive;
 
-};
+} dnbd3_device_t;
 
 #endif /* DNBD_H_ */
diff --git a/src/kernel/net.c b/src/kernel/net.c
index 8f3227a..dba45c6 100644
--- a/src/kernel/net.c
+++ b/src/kernel/net.c
@@ -21,13 +21,13 @@
 #include "net.h"
 #include "utils.h"
 
-void dnbd3_net_connect(struct dnbd3_device *lo)
+void dnbd3_net_connect(dnbd3_device_t *lo)
 {
     struct sockaddr_in sin;
     struct msghdr msg;
     struct kvec iov;
-    struct dnbd3_request dnbd3_request;
-    struct dnbd3_reply dnbd3_reply;
+    dnbd3_request_t dnbd3_request;
+    dnbd3_reply_t dnbd3_reply;
 
     if (!lo->host || !lo->port || !lo->image_id)
     {
@@ -98,7 +98,7 @@ void dnbd3_net_connect(struct dnbd3_device *lo)
     add_timer(&lo->hb_timer);
 }
 
-void dnbd3_net_disconnect(struct dnbd3_device *lo)
+void dnbd3_net_disconnect(dnbd3_device_t *lo)
 {
     struct request *blk_request, *tmp_request;
     printk("INFO: Disconnecting device %s\n", lo->disk->disk_name);
@@ -133,8 +133,8 @@ void dnbd3_net_disconnect(struct dnbd3_device *lo)
 
 int dnbd3_net_send(void *data)
 {
-    struct dnbd3_device *lo = data;
-    struct dnbd3_request dnbd3_request;
+    dnbd3_device_t *lo = data;
+    dnbd3_request_t dnbd3_request;
     struct request *blk_request;
     struct msghdr msg;
     struct kvec iov;
@@ -196,8 +196,8 @@ int dnbd3_net_send(void *data)
 
 int dnbd3_net_receive(void *data)
 {
-    struct dnbd3_device *lo = data;
-    struct dnbd3_reply dnbd3_reply;
+    dnbd3_device_t *lo = data;
+    dnbd3_reply_t dnbd3_reply;
     struct request *blk_request;
     struct msghdr msg;
     struct kvec iov;
@@ -281,7 +281,7 @@ int dnbd3_net_receive(void *data)
 
 void dnbd3_net_heartbeat(unsigned long arg)
 {
-    struct dnbd3_device *lo = (struct dnbd3_device *) arg;
+    dnbd3_device_t *lo = (dnbd3_device_t *) arg;
     list_add(&lo->hb_request.queuelist, &lo->request_queue_send);
     wake_up(&lo->process_queue_send);
     lo->hb_timer.expires = jiffies + HB_INTERVAL;
diff --git a/src/kernel/net.h b/src/kernel/net.h
index 66bc195..b9b31a4 100644
--- a/src/kernel/net.h
+++ b/src/kernel/net.h
@@ -23,9 +23,9 @@
 
 #include "dnbd3.h"
 
-void dnbd3_net_connect(struct dnbd3_device *lo);
+void dnbd3_net_connect(dnbd3_device_t *lo);
 
-void dnbd3_net_disconnect(struct dnbd3_device *lo);
+void dnbd3_net_disconnect(dnbd3_device_t *lo);
 
 int dnbd3_net_send(void *data);