diff options
Diffstat (limited to 'src/kernel/sysfs.c')
| -rw-r--r-- | src/kernel/sysfs.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/kernel/sysfs.c b/src/kernel/sysfs.c index 2c319e3..f5fb99a 100644 --- a/src/kernel/sysfs.c +++ b/src/kernel/sysfs.c @@ -29,7 +29,7 @@ #define MIN(a,b) ((a) < (b) ? (a) : (b)) #endif -ssize_t show_initial_server_addr(char *buf, dnbd3_device *dev) +ssize_t show_initial_server_addr(char *buf, struct dnbd3_device *dev) { if (dev->initial_server.host.type == HOST_IP4) return MIN(snprintf(buf, PAGE_SIZE, "%pI4,%d\n", dev->initial_server.host.addr, (int)ntohs(dev->initial_server.host.port)), PAGE_SIZE); @@ -39,7 +39,7 @@ ssize_t show_initial_server_addr(char *buf, dnbd3_device *dev) return 0; } -ssize_t show_connected_servers(char *buf, dnbd3_device *dev) +ssize_t show_connected_servers(char *buf, struct dnbd3_device *dev) { int i, size = PAGE_SIZE, ret; for (i = 0; i < NUMBER_CONNECTIONS; ++i) { @@ -78,7 +78,7 @@ ssize_t show_connected_servers(char *buf, dnbd3_device *dev) // 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 *dev) +ssize_t show_alt_server_num(char *buf, struct dnbd3_device *dev) { int i, num = 0; for (i = 0; i < NUMBER_SERVERS; ++i) @@ -88,7 +88,7 @@ ssize_t show_alt_server_num(char *buf, dnbd3_device *dev) return MIN(snprintf(buf, PAGE_SIZE, "%d\n", num), PAGE_SIZE); } -ssize_t show_alt_servers(char *buf, dnbd3_device *dev) +ssize_t show_alt_servers(char *buf, struct dnbd3_device *dev) { int i, size = PAGE_SIZE, ret; for (i = 0; i < NUMBER_SERVERS; ++i) @@ -120,30 +120,30 @@ ssize_t show_alt_servers(char *buf, dnbd3_device *dev) return PAGE_SIZE - size; } -ssize_t show_image_name(char *buf, dnbd3_device *dev) +ssize_t show_image_name(char *buf, struct 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 *dev) +ssize_t show_rid(char *buf, struct dnbd3_device *dev) { return MIN(snprintf(buf, PAGE_SIZE, "%d\n", dev->rid), PAGE_SIZE); } -ssize_t show_update_available(char *buf, dnbd3_device *dev) +ssize_t show_update_available(char *buf, struct dnbd3_device *dev) { return MIN(snprintf(buf, PAGE_SIZE, "%d\n", dev->update_available), PAGE_SIZE); } -device_attr_t initial_server = +struct device_attr_t initial_server = { .attr = {.name = "initial_server", .mode = 0444 }, .show = show_initial_server_addr, .store = NULL, }; -device_attr_t connected_server = +struct device_attr_t connected_server = { .attr = {.name = "connected_server", .mode = 0444 }, .show = show_connected_servers, @@ -156,35 +156,35 @@ device_attr_t connected_server = // .store = NULL, //}; -device_attr_t alt_server_num = +struct device_attr_t alt_server_num = { .attr = {.name = "alt_server_num", .mode = 0444 }, .show = show_alt_server_num, .store = NULL, }; -device_attr_t alt_servers = +struct device_attr_t alt_servers = { .attr = {.name = "alt_servers", .mode = 0444 }, .show = show_alt_servers, .store = NULL, }; -device_attr_t image_name = +struct device_attr_t image_name = { .attr = {.name = "image_name", .mode = 0444 }, .show = show_image_name, .store = NULL, }; -device_attr_t rid = +struct device_attr_t rid = { .attr = {.name = "rid", .mode = 0444 }, .show = show_rid, .store = NULL, }; -device_attr_t update_available = +struct device_attr_t update_available = { .attr = {.name = "update_available", .mode = 0444 }, .show = show_update_available, @@ -193,8 +193,8 @@ 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 *dev = container_of(kobj, dnbd3_device, kobj); + struct device_attr_t *device_attr = container_of(attr, struct device_attr_t, attr); + struct dnbd3_device *dev = container_of(kobj, struct dnbd3_device, kobj); return device_attr->show(buf, dev); } @@ -217,7 +217,7 @@ struct sysfs_ops device_ops = .show = device_show, }; -void release(struct kobject *kobj) +static void release(struct kobject *kobj) { kobj->state_initialized = 0; } @@ -230,7 +230,7 @@ struct kobj_type device_ktype = }; -void dnbd3_sysfs_init(dnbd3_device *dev) +void dnbd3_sysfs_init(struct dnbd3_device *dev) { int error; struct kobject *kobj = &dev->kobj; @@ -242,7 +242,7 @@ void dnbd3_sysfs_init(dnbd3_device *dev) printk("Error initializing dnbd3 device!\n"); } -void dnbd3_sysfs_exit(dnbd3_device *dev) +void dnbd3_sysfs_exit(struct dnbd3_device *dev) { kobject_put(&dev->kobj); } |