[KERNEL] convert debug messages and clean up code

This change converts all debug messages to support the Linux kernel's
dynamic debug feature. Debug messages can be enabled or disabled by
the debug feature if the

  - kernel module is built in debug mode (EXTRA_CFLAGS=-g -DDEBUG)
  - Linux kernel supports dynamic debug (CONFIG_DYNAMIC_DEBUG is set)

This patch removes outdated kernel compatibility macros (used for Linux
kernels in version 4.x) and cleans up the kernel module's code.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/kernel/sysfs.c b/src/kernel/sysfs.c
index 4406072..1dbae3c 100644
--- a/src/kernel/sysfs.c
+++ b/src/kernel/sysfs.c
@@ -30,9 +30,9 @@
 ssize_t show_cur_server_addr(char *buf, dnbd3_device_t *dev)
 {
 	if (dev->cur_server.host.type == HOST_IP4)
-		return MIN(snprintf(buf, PAGE_SIZE, "%pI4,%d\n", dev->cur_server.host.addr, (int)ntohs(dev->cur_server.host.port)), PAGE_SIZE);
+		return MIN(snprintf(buf, PAGE_SIZE, "%pI4:%d\n", dev->cur_server.host.addr, (int)ntohs(dev->cur_server.host.port)), PAGE_SIZE);
 	else if (dev->cur_server.host.type == HOST_IP6)
-		return MIN(snprintf(buf, PAGE_SIZE, "%pI6,%d\n", dev->cur_server.host.addr, (int)ntohs(dev->cur_server.host.port)), PAGE_SIZE);
+		return MIN(snprintf(buf, PAGE_SIZE, "[%pI6]:%d\n", dev->cur_server.host.addr, (int)ntohs(dev->cur_server.host.port)), PAGE_SIZE);
 	*buf = '\0';
 	return 0;
 }
@@ -58,14 +58,14 @@ ssize_t show_alt_servers(char *buf, dnbd3_device_t *dev)
 	for (i = 0; i < NUMBER_SERVERS; ++i)
 	{
 		if (dev->alt_servers[i].host.type == HOST_IP4)
-			ret = MIN(snprintf(buf, size, "%pI4,%d,%llu,%d\n",
+			ret = MIN(snprintf(buf, size, "%pI4:%d,%llu,%d\n",
 			                   dev->alt_servers[i].host.addr,
 			                   (int)ntohs(dev->alt_servers[i].host.port),
 			                   (unsigned long long)((dev->alt_servers[i].rtts[0] + dev->alt_servers[i].rtts[1] + dev->alt_servers[i].rtts[2] + dev->alt_servers[i].rtts[3]) / 4),
 			                   (int)dev->alt_servers[i].failures)
 			          , size);
 		else if (dev->alt_servers[i].host.type == HOST_IP6)
-			ret = MIN(snprintf(buf, size, "%pI6,%d,%llu,%d\n",
+			ret = MIN(snprintf(buf, size, "[%pI6]:%d,%llu,%d\n",
 			                   dev->alt_servers[i].host.addr,
 			                   (int)ntohs(dev->alt_servers[i].host.port),
 			                   (unsigned long long)((dev->alt_servers[i].rtts[0] + dev->alt_servers[i].rtts[1] + dev->alt_servers[i].rtts[2] + dev->alt_servers[i].rtts[3]) / 4),
@@ -196,7 +196,7 @@ void dnbd3_sysfs_init(dnbd3_device_t *dev)
 
 	error = kobject_init_and_add(kobj, ktype, parent, "%s", "net");
 	if (error)
-		printk("Error initializing dnbd3 device!\n");
+		dev_err(dnbd3_device_to_dev(dev), "initializing sysfs for device failed!\n");
 }
 
 void dnbd3_sysfs_exit(dnbd3_device_t *dev)