From fe378b324af5f8cc1776b31892caeb939ab1f3bd Mon Sep 17 00:00:00 2001 From: Andy Grover Date: Mar 31 2016 17:42:55 +0000 Subject: version 1.0.3-2 Signed-off-by: Andy Grover --- diff --git a/0001-glfs-Fix-writes.patch b/0001-glfs-Fix-writes.patch new file mode 100644 index 0000000..8429a48 --- /dev/null +++ b/0001-glfs-Fix-writes.patch @@ -0,0 +1,35 @@ +From 779df553d7bca45a449e231a306e2d7f4a30c0ad Mon Sep 17 00:00:00 2001 +From: Andy Grover +Date: Thu, 31 Mar 2016 10:37:18 -0700 +Subject: [PATCH] glfs: Fix writes + +On writes, length should be the length in bytes, not blocks. + +Add an errp. + +Signed-off-by: Andy Grover +--- + glfs.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/glfs.c b/glfs.c +index d4b7430..f623adf 100644 +--- a/glfs.c ++++ b/glfs.c +@@ -420,7 +420,7 @@ int tcmu_glfs_handle_cmd( + case WRITE_10: + case WRITE_12: + case WRITE_16: +- length = tcmu_get_xfer_length(cdb); ++ length = tl; + write: + ret = glfs_pwritev(gfd, iovec, iov_cnt, offset, ALLOWED_BSOFLAGS); + +@@ -430,6 +430,7 @@ write: + || !state->wce) + glfs_fdatasync(gfd); + } else { ++ errp("Error on write %x %x\n", ret, length); + result = set_medium_error(sense); + break; + } diff --git a/tcmu-runner.spec b/tcmu-runner.spec index cc13e07..229e1fc 100644 --- a/tcmu-runner.spec +++ b/tcmu-runner.spec @@ -3,9 +3,10 @@ License: ASL 2.0 Group: System Environment/Daemons Summary: A daemon that supports LIO userspace backends Version: 1.0.3 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://github.com/agrover/tcmu-runner Source: https://fedorahosted.org/released/tcmu-runner/%{name}-%{version}.tar.gz +Patch0: 0001-glfs-Fix-writes.patch BuildRequires: cmake glib2-devel libnl3-devel glusterfs-api-devel kmod-devel zlib-devel Requires: targetcli @@ -33,6 +34,7 @@ Development header(s) for developing against libtcmu. %prep %setup -q +%patch0 -p1 %build %cmake -DSUPPORT_SYSTEMD=ON .