New Upstream Release - tgt
Ready changes
Summary
Merged new upstream version: 1.0.86 (was: 1.0.84).
Diff
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..69c08b3
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,17 @@
+name: ci
+
+on: [pull_request]
+
+jobs:
+ build:
+ name: build
+ runs-on: ubuntu-22.04
+ steps:
+ - name: checking out
+ uses: actions/checkout@v3
+ with:
+ path: tgt
+ - name: build
+ working-directory: tgt
+ run: |
+ make
diff --git a/Makefile b/Makefile
index 003d720..eab65b1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION ?= 1.0.84
+VERSION ?= 1.0.86
CHECK_CC = cgcc
CHECK_CC_FLAGS = '$(CHECK_CC) -Wbitwise -Wno-return-void -no-compile $(ARCH)'
diff --git a/README.md b/README.md
index f78866e..7008261 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
## Introduction
The Linux target framework (tgt) is a user space SCSI target framework
-that supports the iSCSI and iSER transport protocols and that also
-supports multiple methods for accessing block storage. Tgt consists of
+that supports the iSCSI and iSER transport protocols and that supports
+multiple methods for accessing block storage. Tgt consists of
user-space daemon and tools.
Currently, tgt supports the following SCSI transport protocols:
@@ -37,22 +37,19 @@ The code is released under the GNU General Public License version 2.
## Requirements
-Linux kernel version 2.6.22 or newer is recommended because tgt can get
-better performance with signalfd.
-
Target drivers have their own ways to build, configure, etc. Please
find an appropriate documentation in the doc directory.
## Developer Notes
The central communication channel for tgt development is the mailing list
-(stgt@vger.kernel.org).
+(<stgt@vger.kernel.org>).
First, please read the following documents (in short, follow Linux
kernel development rules):
-https://www.kernel.org/doc/Documentation/CodingStyle
-https://www.kernel.org/doc/Documentation/SubmittingPatches
+- https://www.kernel.org/doc/Documentation/process/coding-style.rst
+- https://www.kernel.org/doc/Documentation/process/submitting-patches.rst
Then, check your patches with the patch style checker prior to
submission (scripts/checkpatch.pl) like the following example.
diff --git a/debian/changelog b/debian/changelog
index 1f93ab8..4c6bbde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tgt (1:1.0.86-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk> Tue, 07 Feb 2023 23:56:05 -0000
+
tgt (1:1.0.84-1) unstable; urgency=medium
* New upstream version 1.0.84:
diff --git a/debian/patches/0001-conf-makefile b/debian/patches/0001-conf-makefile
index b835c04..c9bbd80 100644
--- a/debian/patches/0001-conf-makefile
+++ b/debian/patches/0001-conf-makefile
@@ -6,10 +6,10 @@ Subject: Install config examples under /usr/share/doc
conf/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/conf/Makefile b/conf/Makefile
-index bff222f..382a918 100644
---- a/conf/Makefile
-+++ b/conf/Makefile
+Index: tgt.git/conf/Makefile
+===================================================================
+--- tgt.git.orig/conf/Makefile
++++ tgt.git/conf/Makefile
@@ -11,9 +11,9 @@ install:
if [ ! -f $(DESTDIR)$(sysconfdir)/tgt/targets.conf ] ; then \
install -m 644 targets.conf $(DESTDIR)$(sysconfdir)/tgt ; \
diff --git a/debian/patches/0002-use-docbook-xsl.patch b/debian/patches/0002-use-docbook-xsl.patch
index 62cfd6a..4aa7ce7 100644
--- a/debian/patches/0002-use-docbook-xsl.patch
+++ b/debian/patches/0002-use-docbook-xsl.patch
@@ -8,10 +8,10 @@ Last-Update: 2014-05-13
doc/Makefile | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
-diff --git a/doc/Makefile b/doc/Makefile
-index 4af9d54..e937f5e 100644
---- a/doc/Makefile
-+++ b/doc/Makefile
+Index: tgt.git/doc/Makefile
+===================================================================
+--- tgt.git.orig/doc/Makefile
++++ tgt.git/doc/Makefile
@@ -36,40 +36,40 @@ clean:
-rm -f manpages htmlpages
diff --git a/debian/patches/0003-use-dpkg-buildflags.patch b/debian/patches/0003-use-dpkg-buildflags.patch
index 162e956..83bafe0 100644
--- a/debian/patches/0003-use-dpkg-buildflags.patch
+++ b/debian/patches/0003-use-dpkg-buildflags.patch
@@ -8,11 +8,11 @@ Last-Update: 2014-05-13
usr/Makefile | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
-diff --git a/usr/Makefile b/usr/Makefile
-index decf13c..a906fe3 100644
---- a/usr/Makefile
-+++ b/usr/Makefile
-@@ -63,14 +63,15 @@ TGTD_OBJS += tgtd.o mgmt.o target.o scsi.o log.o driver.o util.o work.o \
+Index: tgt.git/usr/Makefile
+===================================================================
+--- tgt.git.orig/usr/Makefile
++++ tgt.git/usr/Makefile
+@@ -63,14 +63,15 @@ TGTD_OBJS += tgtd.o mgmt.o target.o scsi
TGTD_DEP = $(TGTD_OBJS:.o=.d)
@@ -39,7 +39,7 @@ index decf13c..a906fe3 100644
-include $(TGTADM_DEP)
-@@ -86,22 +87,25 @@ TGTIMG_OBJS = tgtimg.o libssc.o libcrc32c.o
+@@ -86,22 +87,25 @@ TGTIMG_OBJS = tgtimg.o libssc.o libcrc32
TGTIMG_DEP = $(TGTIMG_OBJS:.o=.d)
tgtimg: $(TGTIMG_OBJS)
diff --git a/debian/patches/0004-do-not-build-html-manpages.patch b/debian/patches/0004-do-not-build-html-manpages.patch
index 4d06280..34dbe53 100644
--- a/debian/patches/0004-do-not-build-html-manpages.patch
+++ b/debian/patches/0004-do-not-build-html-manpages.patch
@@ -8,11 +8,11 @@ Last-Update: 2014-05-13
doc/Makefile | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
-diff --git a/doc/Makefile b/doc/Makefile
-index e937f5e..6885b35 100644
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -18,7 +18,7 @@ XMLHTML = htmlpages/tgtd.8.html htmlpages/tgtadm.8.html \
+Index: tgt.git/doc/Makefile
+===================================================================
+--- tgt.git.orig/doc/Makefile
++++ tgt.git/doc/Makefile
+@@ -18,7 +18,7 @@ XMLHTML = htmlpages/tgtd.8.html htmlpage
htmlpages/targets.conf.5.html htmlpages/tgt-setup-lun.8.html
.PHONY:all
diff --git a/debian/patches/0005-fix-aio-detection.patch b/debian/patches/0005-fix-aio-detection.patch
index bd4bd67..3ba6173 100644
--- a/debian/patches/0005-fix-aio-detection.patch
+++ b/debian/patches/0005-fix-aio-detection.patch
@@ -8,10 +8,10 @@ Forwarded: no (Debian-specific)
usr/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/usr/Makefile b/usr/Makefile
-index a906fe3..9525dbe 100644
---- a/usr/Makefile
-+++ b/usr/Makefile
+Index: tgt.git/usr/Makefile
+===================================================================
+--- tgt.git.orig/usr/Makefile
++++ tgt.git/usr/Makefile
@@ -25,7 +25,7 @@ ifneq ($(SD_NOTIFY),)
CFLAGS += -DUSE_SYSTEMD
endif
diff --git a/debian/patches/0006-fix-pie-build b/debian/patches/0006-fix-pie-build
index 434a998..6fd8c25 100644
--- a/debian/patches/0006-fix-pie-build
+++ b/debian/patches/0006-fix-pie-build
@@ -14,10 +14,10 @@ Forwarded: no
usr/Makefile | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
-diff --git a/usr/Makefile b/usr/Makefile
-index 9525dbe..b19abec 100644
---- a/usr/Makefile
-+++ b/usr/Makefile
+Index: tgt.git/usr/Makefile
+===================================================================
+--- tgt.git.orig/usr/Makefile
++++ tgt.git/usr/Makefile
@@ -45,7 +45,7 @@ CFLAGS += -g -O0 -ggdb -rdynamic
else
CFLAGS += -g -O2 -fno-strict-aliasing
diff --git a/debian/patches/0007-Fix-compilation-with-glusterfs-6.patch b/debian/patches/0007-Fix-compilation-with-glusterfs-6.patch
index e55cdbf..8f06337 100644
--- a/debian/patches/0007-Fix-compilation-with-glusterfs-6.patch
+++ b/debian/patches/0007-Fix-compilation-with-glusterfs-6.patch
@@ -11,11 +11,11 @@ functions.
usr/bs_glfs.c | 7 +++++++
2 files changed, 13 insertions(+)
-diff --git a/usr/Makefile b/usr/Makefile
-index b19abec..2c2c82b 100644
---- a/usr/Makefile
-+++ b/usr/Makefile
-@@ -9,6 +9,12 @@ ifneq ($(shell test -n $(shell find /usr/include -name "timerfd.h" | head -n1) &
+Index: tgt.git/usr/Makefile
+===================================================================
+--- tgt.git.orig/usr/Makefile
++++ tgt.git/usr/Makefile
+@@ -9,6 +9,12 @@ ifneq ($(shell test -n $(shell find /usr
CFLAGS += -DUSE_TIMERFD
endif
@@ -28,10 +28,10 @@ index b19abec..2c2c82b 100644
TGTD_OBJS += $(addprefix iscsi/, conn.o param.o session.o \
iscsid.o target.o chap.o sha1.o md5.o transport.o iscsi_tcp.o \
isns.o)
-diff --git a/usr/bs_glfs.c b/usr/bs_glfs.c
-index 93984b4..001092a 100644
---- a/usr/bs_glfs.c
-+++ b/usr/bs_glfs.c
+Index: tgt.git/usr/bs_glfs.c
+===================================================================
+--- tgt.git.orig/usr/bs_glfs.c
++++ tgt.git/usr/bs_glfs.c
@@ -45,6 +45,13 @@
#include "glfs.h"
diff --git a/debian/patches/0008-Fix-example-config-path-in-manpages.patch b/debian/patches/0008-Fix-example-config-path-in-manpages.patch
index 7da11fb..b76bcac 100644
--- a/debian/patches/0008-Fix-example-config-path-in-manpages.patch
+++ b/debian/patches/0008-Fix-example-config-path-in-manpages.patch
@@ -8,10 +8,10 @@ Closes: #979509
doc/tgt-admin.8.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/doc/targets.conf.5.xml b/doc/targets.conf.5.xml
-index b606b83..12f3d86 100644
---- a/doc/targets.conf.5.xml
-+++ b/doc/targets.conf.5.xml
+Index: tgt.git/doc/targets.conf.5.xml
+===================================================================
+--- tgt.git.orig/doc/targets.conf.5.xml
++++ tgt.git/doc/targets.conf.5.xml
@@ -436,7 +436,7 @@ Example configuration file:
</listitem>
</varlistentry>
@@ -21,10 +21,10 @@ index b606b83..12f3d86 100644
<listitem>
<para>
Example configuration file for tgt-admin.
-diff --git a/doc/tgt-admin.8.xml b/doc/tgt-admin.8.xml
-index d4bb006..884e7f3 100644
---- a/doc/tgt-admin.8.xml
-+++ b/doc/tgt-admin.8.xml
+Index: tgt.git/doc/tgt-admin.8.xml
+===================================================================
+--- tgt.git.orig/doc/tgt-admin.8.xml
++++ tgt.git/doc/tgt-admin.8.xml
@@ -223,7 +223,7 @@ Example usage:
</listitem>
</varlistentry>
diff --git a/scripts/tgtd.service b/scripts/tgtd.service
index f31da96..348f106 100644
--- a/scripts/tgtd.service
+++ b/scripts/tgtd.service
@@ -1,6 +1,6 @@
[Unit]
Description=iSCSI target framework daemon
-Documentation=man: tgtd(8)
+Documentation=man:tgtd(8)
After=network.target
# On systems without virtual consoles, don't start any getty. Note
diff --git a/usr/bs_sg.c b/usr/bs_sg.c
index 7d81212..9005ce3 100644
--- a/usr/bs_sg.c
+++ b/usr/bs_sg.c
@@ -36,7 +36,6 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/epoll.h>
-#include <sys/sysmacros.h>
#include <scsi/sg.h>
#include "bsg.h" /* Copied from include/linux/bsg.h */
diff --git a/usr/bs_sheepdog.c b/usr/bs_sheepdog.c
index f702c12..8d730c0 100644
--- a/usr/bs_sheepdog.c
+++ b/usr/bs_sheepdog.c
@@ -294,32 +294,11 @@ struct sheepdog_access_info {
pthread_cond_t inflight_list_cond;
};
-static inline int is_data_obj_writeable(struct sheepdog_inode *inode,
- unsigned int idx)
-{
- return inode->vdi_id == inode->data_vdi_id[idx];
-}
-
-static inline int is_data_obj(uint64_t oid)
-{
- return !(VDI_BIT & oid);
-}
-
-static inline uint64_t data_oid_to_idx(uint64_t oid)
-{
- return oid & (MAX_DATA_OBJS - 1);
-}
-
static inline uint64_t vid_to_vdi_oid(uint32_t vid)
{
return VDI_BIT | ((uint64_t)vid << VDI_SPACE_SHIFT);
}
-static inline uint64_t vid_to_vmstate_oid(uint32_t vid, uint32_t idx)
-{
- return VMSTATE_BIT | ((uint64_t)vid << VDI_SPACE_SHIFT) | idx;
-}
-
static inline uint64_t vid_to_data_oid(uint32_t vid, uint32_t idx)
{
return ((uint64_t)vid << VDI_SPACE_SHIFT) | idx;