diff --git a/.gitignore b/.gitignore index 9efd11a..f84fe14 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /tcmu-runner-1.0.0.tar.gz /tcmu-runner-1.0.1.tar.gz /tcmu-runner-1.0.2.tar.gz +/tcmu-runner-1.0.3.tar.gz diff --git a/0001-glfs-Discontinue-use-of-FETCH_ATTRIBUTE.patch b/0001-glfs-Discontinue-use-of-FETCH_ATTRIBUTE.patch deleted file mode 100644 index 6a555ea..0000000 --- a/0001-glfs-Discontinue-use-of-FETCH_ATTRIBUTE.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 5ecaa21980740946466f76cbcd130708d21498d0 Mon Sep 17 00:00:00 2001 -From: Andy Grover -Date: Mon, 28 Mar 2016 17:20:51 -0700 -Subject: [PATCH] glfs: Discontinue use of FETCH_ATTRIBUTE - -It assumes attribute is a boolean, which is not true for hw_block_size. - -Since hw_block_size is the last place we're using FETCH_ATTRIBUTE, remove -it. - -fixes #49 - -Signed-off-by: Andy Grover ---- - glfs.c | 19 +++++++------------ - 1 file changed, 7 insertions(+), 12 deletions(-) - -diff --git a/glfs.c b/glfs.c -index fcfef0e..d4b7430 100644 ---- a/glfs.c -+++ b/glfs.c -@@ -123,17 +123,6 @@ fail: - return -1; - } - --#define FETCH_ATTRIBUTE(dev, r_value, name) \ --do { \ -- int attribute = tcmu_get_attribute(dev, name); \ -- if (attribute == -1) { \ -- errp("Could not get %s setting\n", #name); \ -- goto fail; \ -- } else { \ -- (r_value) = (attribute) ? true: false; \ -- } \ --} while(0) -- - static bool glfs_check_config(const char *cfgstring, char **reason) - { - char *path; -@@ -224,6 +213,7 @@ static int tcmu_glfs_open(struct tcmu_device *dev) - char *config; - long long size; - struct stat st; -+ int attribute; - - gfsp = calloc(1, sizeof(*gfsp)); - if (!gfsp) -@@ -231,7 +221,12 @@ static int tcmu_glfs_open(struct tcmu_device *dev) - - tcmu_set_dev_private(dev, gfsp); - -- FETCH_ATTRIBUTE(dev, gfsp->block_size, "hw_block_size"); -+ attribute = tcmu_get_attribute(dev, "hw_block_size"); -+ if (attribute == -1) { -+ errp("Could not get hw_block_size setting\n"); -+ goto fail; -+ } -+ gfsp->block_size = attribute; - - size = tcmu_get_device_size(dev); - if (size == -1) { --- -2.5.5 - diff --git a/sources b/sources index 693a835..6bae219 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dac5010e1186d08fd8b9ca0ca12ba303 tcmu-runner-1.0.2.tar.gz +f6be7de29512d7d3427a01c82f118a51 tcmu-runner-1.0.3.tar.gz diff --git a/tcmu-runner.spec b/tcmu-runner.spec index efabe17..cc13e07 100644 --- a/tcmu-runner.spec +++ b/tcmu-runner.spec @@ -2,11 +2,10 @@ Name: tcmu-runner License: ASL 2.0 Group: System Environment/Daemons Summary: A daemon that supports LIO userspace backends -Version: 1.0.2 -Release: 2%{?dist} +Version: 1.0.3 +Release: 1%{?dist} URL: https://github.com/agrover/tcmu-runner Source: https://fedorahosted.org/released/tcmu-runner/%{name}-%{version}.tar.gz -Patch0: 0001-glfs-Discontinue-use-of-FETCH_ATTRIBUTE.patch BuildRequires: cmake glib2-devel libnl3-devel glusterfs-api-devel kmod-devel zlib-devel Requires: targetcli @@ -34,7 +33,6 @@ Development header(s) for developing against libtcmu. %prep %setup -q -%patch0 -p1 %build %cmake -DSUPPORT_SYSTEMD=ON . @@ -67,6 +65,9 @@ make install DESTDIR=%{buildroot} %changelog +* Wed Mar 30 2016 Andy Grover - 1.0.3-1 +- New upstream version + * Thu Mar 24 2016 Andy Grover - 1.0.2-1 - New upstream version