Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mhvtl for openSUSE:Factory checked in at 2021-09-20 23:32:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mhvtl (Old) and /work/SRC/openSUSE:Factory/.mhvtl.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mhvtl" Mon Sep 20 23:32:58 2021 rev:13 rq:920074 version:1.63_release+759.35ddb48e5262 Changes: -------- --- /work/SRC/openSUSE:Factory/mhvtl/mhvtl.changes 2021-07-10 22:55:03.803498809 +0200 +++ /work/SRC/openSUSE:Factory/.mhvtl.new.1899/mhvtl.changes 2021-09-20 23:34:33.591277845 +0200 @@ -1,0 +2,12 @@ +Fri Sep 17 18:05:56 UTC 2021 - Lee Duncan <ldun...@suse.com> + +- Updated to upstream version 1.63_release+759.35ddb48e5262, + so that it will compile on latest (5.14 kernel). Changes: + * mhvtl.ko: Remove reference to DRIVER_SENSE (fixes our build) + * mhvtl.ko: reinstate HAVE_UNLOCKED_IOCTL + * mhvtl.ko: Compile on RH using 4.18 kernels + * Handle scsi_host_template removal of unchecked_isa_dma. + Removing previously-needed patch: + * Handle-scsi_host_template-removal-of-unchecked_isa_d.patch + +------------------------------------------------------------------- Old: ---- Handle-scsi_host_template-removal-of-unchecked_isa_d.patch mhvtl-1.63_release+754.ff8861da60c9.tar.xz New: ---- mhvtl-1.63_release+759.35ddb48e5262.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mhvtl.spec ++++++ --- /var/tmp/diff_new_pack.zBpRR5/_old 2021-09-20 23:34:33.963278305 +0200 +++ /var/tmp/diff_new_pack.zBpRR5/_new 2021-09-20 23:34:33.967278310 +0200 @@ -26,7 +26,7 @@ Name: mhvtl URL: http://sites.google.com/site/linuxvtl2/ -Version: 1.63_release+754.ff8861da60c9 +Version: 1.63_release+759.35ddb48e5262 Release: 0 Requires: mhvtl-kmp Requires: module-init-tools @@ -45,7 +45,6 @@ Group: System/Daemons Source: %{name}-%{version}.tar.xz Source2: %{name}.preamble -Patch1: Handle-scsi_host_template-removal-of-unchecked_isa_d.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_ordering} @@ -78,7 +77,6 @@ %prep %setup -qn %{name}-%{version} -%patch1 -p1 %build make MHVTL_HOME_PATH=%{mhvtl_home_dir} VERSION=%{version} \ ++++++ _service ++++++ --- /var/tmp/diff_new_pack.zBpRR5/_old 2021-09-20 23:34:33.991278340 +0200 +++ /var/tmp/diff_new_pack.zBpRR5/_new 2021-09-20 23:34:33.991278340 +0200 @@ -4,7 +4,7 @@ <param name="url">https://github.com/markh794/mhvtl.git</param> <param name="subdir"></param> <param name="filename">mhvtl</param> - <param name="revision">ff8861da60c9</param> + <param name="revision">35ddb48e5262</param> <param name="versionformat">1.6-3_release+@TAG_OFFSET@.%h</param> <param name="match-tag">1.[0-0]-[0-0]_release</param> <param name="changesgenerate">enable</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.zBpRR5/_old 2021-09-20 23:34:34.003278354 +0200 +++ /var/tmp/diff_new_pack.zBpRR5/_new 2021-09-20 23:34:34.003278354 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/markh794/mhvtl.git</param> - <param name="changesrevision">ff8861da60c9fe412f747740ed6d1754df8bf786</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">35ddb48e5262dfe1d9fba987323b425bad0598ac</param></service></servicedata> \ No newline at end of file ++++++ mhvtl-1.63_release+754.ff8861da60c9.tar.xz -> mhvtl-1.63_release+759.35ddb48e5262.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mhvtl-1.63_release+754.ff8861da60c9/kernel/backport.h new/mhvtl-1.63_release+759.35ddb48e5262/kernel/backport.h --- old/mhvtl-1.63_release+754.ff8861da60c9/kernel/backport.h 2021-04-23 02:47:03.000000000 +0200 +++ new/mhvtl-1.63_release+759.35ddb48e5262/kernel/backport.h 2021-09-14 02:52:54.000000000 +0200 @@ -43,3 +43,8 @@ return f->f_path.dentry->d_inode; } #endif + +/* HAVE_UNLOCKED_IOCTL removed in linux/fs.h for kernels 5.9+ */ +#if LINUX_VERSION_CODE > KERNEL_VERSION(5, 8, 0) +#define HAVE_UNLOCKED_IOCTL 1 +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mhvtl-1.63_release+754.ff8861da60c9/kernel/mhvtl.c new/mhvtl-1.63_release+759.35ddb48e5262/kernel/mhvtl.c --- old/mhvtl-1.63_release+754.ff8861da60c9/kernel/mhvtl.c 2021-04-23 02:47:03.000000000 +0200 +++ new/mhvtl-1.63_release+759.35ddb48e5262/kernel/mhvtl.c 2021-09-14 02:52:54.000000000 +0200 @@ -244,9 +244,6 @@ .remove = vtl_driver_remove, }; -static const int check_condition_result = - (DRIVER_SENSE << 24) | SAM_STAT_CHECK_CONDITION; - /* function declarations */ static int resp_report_luns(struct scsi_cmnd *SCpnt, struct vtl_lu_info *lu); static int fill_from_user_buffer(struct scsi_cmnd *scp, char __user *arr, @@ -328,7 +325,9 @@ .sg_tablesize = SCSI_MAX_SG_CHAIN_SEGMENTS, .cmd_per_lun = 1, .max_sectors = 4096, +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 13, 0) .unchecked_isa_dma = 0, +#endif #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) .use_clustering = ENABLE_CLUSTERING, #else @@ -349,7 +348,7 @@ }; -#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 20, 0) +#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 17, 0) #include "fetch50.c" #elif LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 26) #include "fetch27.c" @@ -742,7 +741,7 @@ alloc_len = cmd[9] + (cmd[8] << 8) + (cmd[7] << 16) + (cmd[6] << 24); if ((alloc_len < 16) || (select_report > 2)) { mk_sense_buffer(lu, ILLEGAL_REQUEST, INVALID_FIELD_IN_CDB,0); - return check_condition_result; + return SAM_STAT_CHECK_CONDITION; } /* can produce response with up to 16k luns (lun 0 to lun 16383) */ memset(arr, 0, MHVTL_RLUN_ARR_SZ);
