diff options
| author | sr | 2012-09-01 18:52:33 +0200 |
|---|---|---|
| committer | sr | 2012-09-01 18:52:33 +0200 |
| commit | 98fc7cbca5a87ab383b559436f289fbe5d4efa70 (patch) | |
| tree | 2d514d4a7d979222a50aab7a565d400130b0c467 /src/kernel | |
| parent | [KERNEL] Tell server whether we're a client or a server in proxy mode (diff) | |
| download | dnbd3-98fc7cbca5a87ab383b559436f289fbe5d4efa70.tar.gz dnbd3-98fc7cbca5a87ab383b559436f289fbe5d4efa70.tar.xz dnbd3-98fc7cbca5a87ab383b559436f289fbe5d4efa70.zip | |
fix complile error
Diffstat (limited to 'src/kernel')
| -rw-r--r-- | src/kernel/core.c | 2 | ||||
| -rw-r--r-- | src/kernel/net.c | 2 | ||||
| -rw-r--r-- | src/kernel/sysfs.c | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/kernel/core.c b/src/kernel/core.c index 63d71d1..1be29a2 100644 --- a/src/kernel/core.c +++ b/src/kernel/core.c @@ -48,7 +48,7 @@ static int __init dnbd3_init(void) if (dnbd3_blk_add_device(&dnbd3_device[i], i) != 0) { printk("ERROR: adding device failed.\n"); - return -EIO; + return -EIO; // TODO: delete all devices added so far. it could happen that it's not the first one that fails. also call unregister_blkdev and free memory } } diff --git a/src/kernel/net.c b/src/kernel/net.c index 4b4da6f..1e43f63 100644 --- a/src/kernel/net.c +++ b/src/kernel/net.c @@ -498,7 +498,7 @@ int dnbd3_net_discover(void *data) serializer_put_uint16(payload, PROTOCOL_VERSION); serializer_put_string(payload, dev->imgname); serializer_put_uint16(payload, dev->rid); - serializer_put_uint8(payload, 1); // Pretent we're a proxy here to prevent the server from updating the atime + serializer_put_uint8(payload, 1); // Pretend we're a proxy here to prevent the server from updating the atime TODO: Update status on server switch iov[1].iov_base = payload; dnbd3_request.size = iov[1].iov_len = serializer_get_written_length(payload); if (kernel_sendmsg(sock, &msg, iov, 2, sizeof(dnbd3_request) + iov[1].iov_len) != sizeof(dnbd3_request) + iov[1].iov_len) diff --git a/src/kernel/sysfs.c b/src/kernel/sysfs.c index 4c903ea..d502194 100644 --- a/src/kernel/sysfs.c +++ b/src/kernel/sysfs.c @@ -33,7 +33,8 @@ ssize_t show_cur_server_addr(char *buf, dnbd3_device_t *dev) return MIN(snprintf(buf, PAGE_SIZE, "%pI4,%d\n", dev->cur_server.hostaddr, (int)ntohs(dev->cur_server.port)), PAGE_SIZE); else if (dev->cur_server.hostaddrtype == AF_INET6) return MIN(snprintf(buf, PAGE_SIZE, "%pI6,%d\n", dev->cur_server.hostaddr, (int)ntohs(dev->cur_server.port)), PAGE_SIZE); - return snprintf(buf, PAGE_SIZE, ""); + *buf = '\0'; + return 0; } ssize_t show_cur_server_rtt(char *buf, dnbd3_device_t *dev) |