summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohann Latocha2012-02-22 18:52:40 +0100
committerJohann Latocha2012-02-22 18:52:40 +0100
commitfa52d46fa84db575d0114691ec8368d3acf84bf5 (patch)
treeefd9745aa78682c36fb71934ead7d5c67b4354e6
parent[KERNEL] Ask alt servers on connect (diff)
downloaddnbd3-fa52d46fa84db575d0114691ec8368d3acf84bf5.tar.gz
dnbd3-fa52d46fa84db575d0114691ec8368d3acf84bf5.tar.xz
dnbd3-fa52d46fa84db575d0114691ec8368d3acf84bf5.zip
[MISC] Config file update
-rw-r--r--dnbd3-server.conf.example6
-rw-r--r--src/kernel/sysfs.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/dnbd3-server.conf.example b/dnbd3-server.conf.example
index d04aea0..3f7a0e2 100644
--- a/dnbd3-server.conf.example
+++ b/dnbd3-server.conf.example
@@ -8,18 +8,18 @@ rid=3
[Ubuntu 10.10]
file=/home/jjl/Data/ISOs/Ubuntu/ubuntu-10.10-desktop-i386.iso
-servers=132.230.4.29;132.230.4.220;132.230.8.96
+servers=132.230.4.29;132.230.8.96
vid=2
rid=1
[Ubuntu 11.04]
file=/home/jjl/Data/ISOs/Ubuntu/ubuntu-11.04-desktop-i386.iso
-servers=132.230.4.29;132.230.4.220;132.230.8.96
+servers=132.230.4.29;132.230.8.96
vid=3
rid=1
[Ubuntu 11.10]
file=/home/jjl/Data/ISOs/Ubuntu/ubuntu-11.10-desktop-i386.iso
-servers=132.230.4.29;132.230.4.220;132.230.8.96
+servers=132.230.4.29;132.230.8.96
vid=4
rid=1
diff --git a/src/kernel/sysfs.c b/src/kernel/sysfs.c
index 177cb8c..43fbe8f 100644
--- a/src/kernel/sysfs.c
+++ b/src/kernel/sysfs.c
@@ -45,7 +45,7 @@ ssize_t show_cur_server_ip(char *buf, dnbd3_device_t *dev)
ssize_t show_cur_server_rtt(char *buf, dnbd3_device_t *dev)
{
- return sprintf(buf, "%lluus\n", dev->cur_server.rtt);
+ return sprintf(buf, "%llu\n", dev->cur_server.rtt);
}
ssize_t show_alt_server_num(char *buf, dnbd3_device_t *dev)
@@ -70,7 +70,7 @@ ssize_t show_alt_server_ip(char *buf, dnbd3_server_t *srv)
ssize_t show_alt_server_rtt(char *buf, dnbd3_server_t *srv)
{
- return sprintf(buf, "%lluus\n", srv->rtt);
+ return sprintf(buf, "%llu\n", srv->rtt);
}
device_attr_t cur_server_ip =