From 0463bc16e0421927f161a976513cd2a46c4cac6b7c03e9200b8db0dc4a2ef0c9 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 3 Jul 2019 11:05:43 +0000 Subject: [PATCH] Accepting request 712866 from home:ukbeast89:branches:openSUSE:Factory -Update to new upstream release 20190410 * Fixes crash when mounting disk image on linux 5.1 * Remove vhba-scsiapi.diff, as upstream builds with linux 5+ https://sourceforge.net/p/cdemu/bugs/111/ OBS-URL: https://build.opensuse.org/request/show/712866 OBS-URL: https://build.opensuse.org/package/show/filesystems/vhba-kmp?expand=0&rev=31 --- vhba-kmp.changes | 8 ++++ vhba-kmp.spec | 3 +- vhba-module-20170610.tar.bz2 | 3 -- vhba-module-20190410.tar.bz2 | 3 ++ vhba-scsiapi.diff | 78 ------------------------------------ 5 files changed, 12 insertions(+), 83 deletions(-) delete mode 100644 vhba-module-20170610.tar.bz2 create mode 100644 vhba-module-20190410.tar.bz2 delete mode 100644 vhba-scsiapi.diff diff --git a/vhba-kmp.changes b/vhba-kmp.changes index ed0479e..e481156 100644 --- a/vhba-kmp.changes +++ b/vhba-kmp.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jul 1 13:45:02 UTC 2019 - Aaron Stern + +-Update to new upstream release 20190410 + * Fixes crash when mounting disk image on linux 5.1 + * Remove vhba-scsiapi.diff, as upstream builds with linux 5.1 + + ------------------------------------------------------------------- Tue May 28 14:38:13 UTC 2019 - Jan Engelhardt diff --git a/vhba-kmp.spec b/vhba-kmp.spec index 3f2b465..fcb0623 100644 --- a/vhba-kmp.spec +++ b/vhba-kmp.spec @@ -17,7 +17,7 @@ Name: vhba-kmp -Version: 20170610 +Version: 20190410 Release: 0 Summary: Virtual SCSI Host Bus Adapter License: GPL-2.0-or-later @@ -29,7 +29,6 @@ Source: http://downloads.sf.net/cdemu/vhba-module-%version.tar.bz2 Source2: %name-preamble Patch1: vhba-no-werror.diff Patch2: vhba-devname.diff -Patch3: vhba-scsiapi.diff BuildRequires: kernel-syms >= 2.6.20 BuildRequires: modutils BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/vhba-module-20170610.tar.bz2 b/vhba-module-20170610.tar.bz2 deleted file mode 100644 index e6bbe77..0000000 --- a/vhba-module-20170610.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7970c93f989d9c4f2629371bf5ee7a76f95e4c12342c3320ddc528d0df02d9ec -size 15622 diff --git a/vhba-module-20190410.tar.bz2 b/vhba-module-20190410.tar.bz2 new file mode 100644 index 0000000..09bdaff --- /dev/null +++ b/vhba-module-20190410.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c18954a8c2c7e208b20afdf785501b23be9382345e6577eba5d653002862394 +size 15741 diff --git a/vhba-scsiapi.diff b/vhba-scsiapi.diff deleted file mode 100644 index 72328dc..0000000 --- a/vhba-scsiapi.diff +++ /dev/null @@ -1,78 +0,0 @@ -From: Jan Engelhardt -Date: 2019-05-28 16:37:03.776407560 +0200 - -cmd->serial_number was removed in commit -52eaa798f4f4e983c711eaa1c13d8859a52946e8 and users were changed to -cmd->request->tag. - ---- - vhba.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -Index: vhba-module-20170610/vhba.c -=================================================================== ---- vhba-module-20170610.orig/vhba.c -+++ vhba-module-20170610/vhba.c -@@ -445,7 +445,7 @@ static int vhba_queuecommand_lck (struct - struct vhba_device *vdev; - int retval; - -- scmd_dbg(cmd, "queue %lu\n", cmd->serial_number); -+ scmd_dbg(cmd, "queue %lu\n", cmd->request->tag); - - vdev = vhba_lookup_device(cmd->device->id); - if (!vdev) { -@@ -476,7 +476,7 @@ static int vhba_abort (struct scsi_cmnd - struct vhba_device *vdev; - int retval = SUCCESS; - -- scmd_warn(cmd, "abort %lu\n", cmd->serial_number); -+ scmd_warn(cmd, "abort %lu\n", cmd->request->tag); - - vdev = vhba_lookup_device(cmd->device->id); - if (vdev) { -@@ -508,7 +508,7 @@ static ssize_t do_request (struct scsi_c - ssize_t ret; - - scmd_dbg(cmd, "request %lu, cdb 0x%x, bufflen %d, use_sg %d\n", -- cmd->serial_number, cmd->cmnd[0], scsi_bufflen(cmd), scsi_sg_count(cmd)); -+ cmd->request->tag, cmd->cmnd[0], scsi_bufflen(cmd), scsi_sg_count(cmd)); - - ret = sizeof(vreq); - if (DATA_TO_DEVICE(cmd->sc_data_direction)) { -@@ -520,7 +520,7 @@ static ssize_t do_request (struct scsi_c - return -EIO; - } - -- vreq.tag = cmd->serial_number; -+ vreq.tag = cmd->request->tag; - vreq.lun = cmd->device->lun; - memcpy(vreq.cdb, cmd->cmnd, MAX_COMMAND_SIZE); - vreq.cdb_len = cmd->cmd_len; -@@ -585,7 +585,7 @@ static ssize_t do_response (struct scsi_ - ssize_t ret = 0; - - scmd_dbg(cmd, "response %lu, status %x, data len %d, use_sg %d\n", -- cmd->serial_number, res->status, res->data_len, scsi_sg_count(cmd)); -+ cmd->request->tag, res->status, res->data_len, scsi_sg_count(cmd)); - - if (res->status) { - unsigned char sense_stack[SCSI_SENSE_BUFFERSIZE]; -@@ -695,7 +695,7 @@ static inline struct vhba_command *match - struct vhba_command *vcmd; - - list_for_each_entry(vcmd, &vdev->cmd_list, entry) { -- if (vcmd->cmd->serial_number == tag) { -+ if (vcmd->cmd->request->tag == tag) { - break; - } - } -@@ -931,7 +931,7 @@ static int vhba_ctl_release (struct inod - list_for_each_entry(vcmd, &vdev->cmd_list, entry) { - WARN_ON(vcmd->status == VHBA_REQ_READING || vcmd->status == VHBA_REQ_WRITING); - -- scmd_warn(vcmd->cmd, "device released with command %lu\n", vcmd->cmd->serial_number); -+ scmd_warn(vcmd->cmd, "device released with command %lu\n", vcmd->cmd->request->tag); - vcmd->cmd->result = DID_NO_CONNECT << 16; - vcmd->cmd->scsi_done(vcmd->cmd); -