Commit 2ff88c5d authored by Nikos Skalkotos's avatar Nikos Skalkotos

Merge branch 'hotfix-2.1.1'

parents 3c577313 3ec483a0
2.1rc2
\ No newline at end of file
[ packages ]
[[ blktap-archipelago ]]
version_file = ""
[[ blktap-archipelago-dev ]]
version_file = ""
[[ blktap-archipelago-utils ]]
version_file = ""
[[ libvhd0-archipelago ]]
version_file = ""
[[ libvhd0-archipelago-2.1rc1 ]]
version_file = ""
[[ libblktapctl0-archipelago ]]
version_file = ""
version_file = "version.m4"
version_template = "version_template"
......@@ -80,4 +80,4 @@ libtapdisk_la_SOURCES += block-llcache.c
libtapdisk_la_SOURCES += block-archipelago.c
libtapdisk_la_LIBADD = ../vhd/lib/libvhd.la
libtapdisk_la_LIBADD += -laio -lxseg
libtapdisk_la_LIBADD += -laio -lxseg -lpthread
......@@ -253,7 +253,7 @@ llpcache_fork_write(td_llpcache_t *s, td_request_t treq)
return;
}
memset(req, 0, sizeof(req));
memset(req, 0, sizeof(*req));
req->treq = treq;
......@@ -553,7 +553,7 @@ llecache_forward_write(td_llecache_t *s, td_request_t treq)
return;
}
memset(req, 0, sizeof(req));
memset(req, 0, sizeof(*req));
req->treq = treq;
req->pending = treq.secs;
......
......@@ -163,7 +163,7 @@ tapdisk_logfile_open(td_logfile_t *log,
{
int err;
memset(log, 0, sizeof(log));
memset(log, 0, sizeof(*log));
tapdisk_logfile_name(log->path, sizeof(log->path), dir, ident, ext);
......
m4_define([BLKTAP_VERSION], [m4_include(VERSION)])
m4_define([BLKTAP_VERSION], [2.1.1])
m4_define([BLKTAP_VERSION], [%(DEVFLOW_VERSION)s])
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment