Hello community,
here is the log from the commit of package iscsitarget for openSUSE:Factory
checked in at 2014-03-18 15:12:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/iscsitarget (Old)
and /work/SRC/openSUSE:Factory/.iscsitarget.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "iscsitarget"
Changes:
--------
--- /work/SRC/openSUSE:Factory/iscsitarget/iscsitarget.changes 2014-02-22
18:10:29.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.iscsitarget.new/iscsitarget.changes
2014-03-18 15:12:34.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Mar 17 15:05:40 PDT 2014 - ldun...@suse.com
+
+- Added patch for 3.14 kernel: bi_sector => bi_iter.bi_sector
+
+-------------------------------------------------------------------
New:
----
iscsitarget-kernel-3.14.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ iscsitarget.spec ++++++
--- /var/tmp/diff_new_pack.ZByCai/_old 2014-03-18 15:12:35.000000000 +0100
+++ /var/tmp/diff_new_pack.ZByCai/_new 2014-03-18 15:12:35.000000000 +0100
@@ -39,6 +39,7 @@
Patch3: iscsitarget-kernel-3.7.patch
Patch4: iscsitarget-kernel-3.9.patch
Patch5: iscsitarget-no_more_daddr_in_ipc_pinfo.patch
+Patch6: iscsitarget-kernel-3.14.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%suse_kernel_module_package -n %{name} -p %{S:3} kdump um
@@ -72,6 +73,9 @@
%define kernel_ver %(rpm -q --qf '%%{version}' kernel-syms)
%if %(zypper --terse vcmp %{kernel_ver} 3.13) >= 0
%patch5 -p1
+%if %(zypper --terse vcmp %{kernel_ver} 3.14) >= 0
+%patch6 -p1
+%endif
%endif
echo "iscsi_trgt.ko yes" > kernel/Module.supported
++++++ iscsitarget-kernel-3.14.patch ++++++
diff -aurp iscsitarget-1.4.20.3-svn.orig/kernel/block-io.c
iscsitarget-1.4.20.3-svn/kernel/block-io.c
--- iscsitarget-1.4.20.3-svn.orig/kernel/block-io.c 2012-04-22
10:22:29.000000000 -0700
+++ iscsitarget-1.4.20.3-svn/kernel/block-io.c 2014-03-17 15:02:54.032437735
-0700
@@ -87,7 +87,7 @@ blockio_make_request(struct iet_volume *
}
/* bi_sector is ALWAYS in units of 512 bytes */
- bio->bi_sector = ppos >> 9;
+ bio->bi_iter.bi_sector = ppos >> 9;
bio->bi_bdev = bio_data->bdev;
bio->bi_end_io = blockio_bio_endio;
bio->bi_private = tio_work;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
