added first draft for keepalive and discovery

1 files changed, 10 insertions, 9 deletions

diff --git a/src/kernel/sysfs.c b/src/kernel/sysfs.c
index 118cbca..b5e180b 100644
--- a/src/kernel/sysfs.c
+++ b/src/kernel/sysfs.c
@@ -18,9 +18,10 @@
  *
  */
 
+#include "sysfs.h"
+
 #include <linux/kobject.h>
 
-#include "sysfs.h"
 #include "utils.h"
 
 #ifndef MIN
@@ -42,7 +43,7 @@
 //	return MIN(snprintf(buf, PAGE_SIZE, "%llu\n", (unsigned long long)dev->cur_rtt), PAGE_SIZE);
 //}
 
-ssize_t show_alt_server_num(char *buf, dnbd3_device_t *dev)
+ssize_t show_alt_server_num(char *buf, dnbd3_device *dev)
 {
 	int i, num = 0;
 	for (i = 0; i < NUMBER_SERVERS; ++i)
@@ -52,7 +53,7 @@ ssize_t show_alt_server_num(char *buf, dnbd3_device_t *dev)
 	return MIN(snprintf(buf, PAGE_SIZE, "%d\n", num), PAGE_SIZE);
 }
 
-ssize_t show_alt_servers(char *buf, dnbd3_device_t *dev)
+ssize_t show_alt_servers(char *buf, dnbd3_device *dev)
 {
 	int i, size = PAGE_SIZE, ret;
 	for (i = 0; i < NUMBER_SERVERS; ++i)
@@ -84,18 +85,18 @@ ssize_t show_alt_servers(char *buf, dnbd3_device_t *dev)
 	return PAGE_SIZE - size;
 }
 
-ssize_t show_image_name(char *buf, dnbd3_device_t *dev)
+ssize_t show_image_name(char *buf, dnbd3_device *dev)
 {
 	if (dev->imgname == NULL) return sprintf(buf, "(null)");
 	return MIN(snprintf(buf, PAGE_SIZE, "%s\n", dev->imgname), PAGE_SIZE);
 }
 
-ssize_t show_rid(char *buf, dnbd3_device_t *dev)
+ssize_t show_rid(char *buf, dnbd3_device *dev)
 {
 	return MIN(snprintf(buf, PAGE_SIZE, "%d\n", dev->rid), PAGE_SIZE);
 }
 
-ssize_t show_update_available(char *buf, dnbd3_device_t *dev)
+ssize_t show_update_available(char *buf, dnbd3_device *dev)
 {
 	return MIN(snprintf(buf, PAGE_SIZE, "%d\n", dev->update_available), PAGE_SIZE);
 }
@@ -152,7 +153,7 @@ device_attr_t update_available =
 ssize_t device_show(struct kobject *kobj, struct attribute *attr, char *buf)
 {
 	device_attr_t *device_attr = container_of(attr, device_attr_t, attr);
-	dnbd3_device_t *dev = container_of(kobj, dnbd3_device_t, kobj);
+	dnbd3_device *dev = container_of(kobj, dnbd3_device, kobj);
 	return device_attr->show(buf, dev);
 }
 
@@ -187,7 +188,7 @@ struct kobj_type device_ktype =
 };
 
 
-void dnbd3_sysfs_init(dnbd3_device_t *dev)
+void dnbd3_sysfs_init(dnbd3_device *dev)
 {
 	int error;
 	struct kobject *kobj = &dev->kobj;
@@ -199,7 +200,7 @@ void dnbd3_sysfs_init(dnbd3_device_t *dev)
 		printk("Error initializing dnbd3 device!\n");
 }
 
-void dnbd3_sysfs_exit(dnbd3_device_t *dev)
+void dnbd3_sysfs_exit(dnbd3_device *dev)
 {
 	kobject_put(&dev->kobj);
 }