Your message dated Wed, 07 Dec 2016 03:18:31 +0000
with message-id <e1ceskz-00009e...@fasolo.debian.org>
and subject line Bug#838634: fixed in flashcache 3.1.3+git20150701-5
has caused the Debian Bug report #838634,
regarding flashcache-dkms: Failure to build with 4.8 kernels
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
838634: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=838634
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: flashcache
Version: 3.1.3+git20150701-4
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu yakkety ubuntu-patch
Dear Maintainer,
upstream changes in the 4.8 kernel broke the compile of the dkms module
for those. I created an update that fixes this (test compiled for 4.4
and 4.8). While looking at the logs I also fixed a small bug about
missing curly brackets and some unused variables.
I believe that since all functions only pass either READ or WRITE
without special flags, this change should be ok, though extra checking
never hurts.
-Stefan
In Ubuntu, the attached patch was applied to achieve the following:
* Fix build error on Linux 4.8 (LP: #1625069)
Thanks for considering the patch.
-- System Information:
Debian Release: jessie/sid
APT prefers trusty-updates
APT policy: (500, 'trusty-updates'), (500, 'trusty-security'), (500,
'trusty-proposed'), (500, 'trusty'), (100, 'trusty-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.13.0-96-generic (SMP w/8 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru flashcache-3.1.3+git20150701/debian/changelog flashcache-3.1.3+git20150701/debian/changelog
diff -Nru flashcache-3.1.3+git20150701/debian/patches/compat-4.8.patch flashcache-3.1.3+git20150701/debian/patches/compat-4.8.patch
--- flashcache-3.1.3+git20150701/debian/patches/compat-4.8.patch 1970-01-01 01:00:00.000000000 +0100
+++ flashcache-3.1.3+git20150701/debian/patches/compat-4.8.patch 2016-09-22 12:58:39.000000000 +0200
@@ -0,0 +1,121 @@
+Description: Fix FTBS on target systems running 4.8+ kernels
+ The bi_rw field was split into bi_op and bi_op_flags. Right now it looked
+ like the created IOs would be only plain READ or WRITE ones. If this ever
+ changes, then the whole call chain needs some update.
+ While looking at the source fix one warning and one potential bug of not
+ properly guarding an if section with { }.
+Author: Stefan Bader <stefan.ba...@canonical.com>
+
+Index: flashcache-3.1.3+git20150701/src/flashcache_ioctl.c
+===================================================================
+--- flashcache-3.1.3+git20150701.orig/src/flashcache_ioctl.c 2016-09-22 12:19:34.000000000 +0200
++++ flashcache-3.1.3+git20150701/src/flashcache_ioctl.c 2016-09-22 12:50:04.946286707 +0200
+@@ -541,7 +541,6 @@ flashcache_message(struct dm_target *ti,
+
+ /* Decode the sub-command. */
+ if (strcmp(argv[1], "add") == 0) {
+- int rr;
+ if (argc != 3)
+ return -EINVAL;
+
+Index: flashcache-3.1.3+git20150701/src/flashcache_kcopy.c
+===================================================================
+--- flashcache-3.1.3+git20150701.orig/src/flashcache_kcopy.c 2015-07-02 01:09:43.000000000 +0200
++++ flashcache-3.1.3+git20150701/src/flashcache_kcopy.c 2016-09-22 12:50:04.962286707 +0200
+@@ -279,7 +279,11 @@ dm_io_async_pagelist_IO(struct flashcach
+ {
+ struct dm_io_request iorq;
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,8,0)
+ iorq.bi_rw = rw;
++#else
++ iorq.bi_op = rw;
++#endif
+ iorq.mem.type = DM_IO_PAGE_LIST;
+ iorq.mem.ptr.pl = pl;
+ iorq.mem.offset = 0;
+Index: flashcache-3.1.3+git20150701/src/flashcache_main.c
+===================================================================
+--- flashcache-3.1.3+git20150701.orig/src/flashcache_main.c 2015-07-02 01:09:43.000000000 +0200
++++ flashcache-3.1.3+git20150701/src/flashcache_main.c 2016-09-22 12:50:04.962286707 +0200
+@@ -116,7 +116,11 @@ int dm_io_async_bvec_pl(unsigned int num
+ {
+ struct dm_io_request iorq;
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,8,0)
+ iorq.bi_rw = rw;
++#else
++ iorq.bi_op = rw;
++#endif
+ iorq.mem.type = DM_IO_PAGE_LIST;
+ iorq.mem.ptr.pl = pl;
+ iorq.mem.offset = 0;
+@@ -140,7 +144,11 @@ int dm_io_async_bvec(unsigned int num_re
+ {
+ struct dm_io_request iorq;
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,8,0)
+ iorq.bi_rw = rw;
++#else
++ iorq.bi_op = rw;
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)
+ iorq.mem.type = DM_IO_BIO;
+ iorq.mem.ptr.bio = bio;
+@@ -325,7 +333,7 @@ flashcache_io_callback(unsigned long err
+ }
+ } else {
+ dmc->flashcache_errors.ssd_write_errors++;
+- if (dmc->cache_mode == FLASHCACHE_WRITE_THROUGH)
++ if (dmc->cache_mode == FLASHCACHE_WRITE_THROUGH) {
+ /*
+ * We don't know if the IO failed because of a ssd write
+ * error or a disk write error. Bump up both.
+@@ -335,6 +343,7 @@ flashcache_io_callback(unsigned long err
+ */
+ disk_error = -EIO;
+ dmc->flashcache_errors.disk_write_errors++;
++ }
+ }
+ break;
+ }
+@@ -2052,7 +2061,11 @@ flashcache_write(struct cache_c *dmc, st
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
+ #define bio_barrier(bio) ((bio)->bi_rw & REQ_HARDBARRIER)
+ #else
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,8,0)
+ #define bio_barrier(bio) ((bio)->bi_rw & REQ_FLUSH)
++#else
++#define bio_barrier(bio) ((bio)->bi_opf & REQ_PREFLUSH)
++#endif
+ #endif
+ #endif
+ #endif
+Index: flashcache-3.1.3+git20150701/src/flashcache_subr.c
+===================================================================
+--- flashcache-3.1.3+git20150701.orig/src/flashcache_subr.c 2016-09-22 12:19:34.000000000 +0200
++++ flashcache-3.1.3+git20150701/src/flashcache_subr.c 2016-09-22 12:50:04.962286707 +0200
+@@ -848,7 +848,11 @@ flashcache_dm_io_async_vm(struct cache_c
+ unsigned long error_bits = 0;
+ int error;
+ struct dm_io_request io_req = {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,8,0)
+ .bi_rw = rw,
++#else
++ .bi_op = rw,
++#endif
+ .mem.type = DM_IO_VMA,
+ .mem.ptr.vma = data,
+ .mem.offset = 0,
+@@ -936,7 +940,11 @@ flashcache_dm_io_sync_vm(struct cache_c
+ unsigned long error_bits = 0;
+ int error;
+ struct dm_io_request io_req = {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,8,0)
+ .bi_rw = rw,
++#else
++ .bi_op = rw,
++#endif
+ .mem.type = DM_IO_VMA,
+ .mem.ptr.vma = data,
+ .mem.offset = 0,
diff -Nru flashcache-3.1.3+git20150701/debian/patches/series flashcache-3.1.3+git20150701/debian/patches/series
--- flashcache-3.1.3+git20150701/debian/patches/series 2016-04-07 18:03:10.000000000 +0200
+++ flashcache-3.1.3+git20150701/debian/patches/series 2016-09-22 12:48:38.000000000 +0200
@@ -2,3 +2,4 @@
honor-cflags-and-ldflags.patch
fix-build-error-on-linux-4.3.patch
switch-from-ioctl-to-dm-target-messages.patch
+compat-4.8.patch
--- End Message ---
--- Begin Message ---
Source: flashcache
Source-Version: 3.1.3+git20150701-5
We believe that the bug you reported is fixed in the latest version of
flashcache, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 838...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Liang Guo <guoli...@debian.org> (supplier of updated flashcache package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Sat, 03 Dec 2016 18:38:41 +0800
Source: flashcache
Binary: flashcache-dkms flashcache-utils
Architecture: source all amd64
Version: 3.1.3+git20150701-5
Distribution: unstable
Urgency: medium
Maintainer: Liang Guo <guoli...@debian.org>
Changed-By: Liang Guo <guoli...@debian.org>
Description:
flashcache-dkms - write-back block device cache for Linux (DKMS version)
flashcache-utils - write-back block device cache for Linux (user space
utilities)
Closes: 838634
Changes:
flashcache (3.1.3+git20150701-5) unstable; urgency=medium
.
* Fix FTBFS on Linux 4.8+, Thanks to Stefan Bader (Closes: #838634)
* Bump standards version to 3.9.8
Checksums-Sha1:
1c6231e5209716493938a7116bf6274cc33bddec 2078
flashcache_3.1.3+git20150701-5.dsc
4a0221d90ec14f281f504c7f76fe8938782a8f0e 13084
flashcache_3.1.3+git20150701-5.debian.tar.xz
b49b615d6d9d3e8d5801ccad441a826db83ccbe2 52590
flashcache-dkms_3.1.3+git20150701-5_all.deb
104f293ed68281301a5a49fbcfb243ba87b7a27b 27036
flashcache-utils-dbgsym_3.1.3+git20150701-5_amd64.deb
7acab1943ebfb7e79886c2ed6112cf882d4c42fd 43568
flashcache-utils_3.1.3+git20150701-5_amd64.deb
71f42f94a596374e86845052dc7dca3bab536d7c 5601
flashcache_3.1.3+git20150701-5_amd64.buildinfo
Checksums-Sha256:
11501f413761440c64e0acf579201fc1efc722c7423245a4d6208c5ee7b18126 2078
flashcache_3.1.3+git20150701-5.dsc
664a1e5a925081f6985b3ccd3533e5737462e251fb800d8d4d1cc6d16eb4a674 13084
flashcache_3.1.3+git20150701-5.debian.tar.xz
08c4a8acaa62b5c39cdd95ed9fe5ae74886c37dfe4b184ea74cb1c7638fa3a00 52590
flashcache-dkms_3.1.3+git20150701-5_all.deb
8e0749cb9842443676e1ff15c8de4212855c75821cd290579d4f4fe97100d4c1 27036
flashcache-utils-dbgsym_3.1.3+git20150701-5_amd64.deb
1be5445990c9ad6409c340ab0066895eb1092581b26e789e12c568b700fab9c3 43568
flashcache-utils_3.1.3+git20150701-5_amd64.deb
4019890c02c5e9836fc018f62fd0c567bd836ab6e922bd487feb5234d90dd9bc 5601
flashcache_3.1.3+git20150701-5_amd64.buildinfo
Files:
2c9e9861980f21d035e4e2efd94fb38c 2078 kernel optional
flashcache_3.1.3+git20150701-5.dsc
6084b742e8f293a146df05dbba1aadef 13084 kernel optional
flashcache_3.1.3+git20150701-5.debian.tar.xz
084f6e5e88059f84f8407f87dcca8484 52590 kernel optional
flashcache-dkms_3.1.3+git20150701-5_all.deb
2af085c0a842d05374ce9ff6b881ba21 27036 debug extra
flashcache-utils-dbgsym_3.1.3+git20150701-5_amd64.deb
75307b1fbc28fbe45b2aa929c16ffe2d 43568 utils optional
flashcache-utils_3.1.3+git20150701-5_amd64.deb
d9bfd1a0c80ca5a998efd7e3811c0292 5601 kernel optional
flashcache_3.1.3+git20150701-5_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEEK3+Cr1Da3eFrb0htgrW0CGjAl7wFAlhHbC4ACgkQgrW0CGjA
l7xvcA/8CdLAfX7STc8XDxZ5O2IIbOt5bf+98mtvpLKFLEBx9TNc/wf/ztGL1rtV
BIg2sj7ECxD+6L10GyqPHv24MZODZOFeXmkrDaDqhN6M9IQ4Xb3eiTzjJdpD54tb
r0J+EnF3PrXLXbYX6niIN77wBV4yx2TjDdTk0GT9i4LmHVxJCuCF+zP+KI8Whk5W
5hAbaTLuYth/v88WA9SqKAmPn+Dy+PWAOcMgo5x9jPZZN6k+eLKSOIxoDajYBwZy
g4O8ZBaOqWTtyN3P2OYxeKGmVXmG2LiCirQ4mQU/McWggIy1JUCsnfWmel+KybVU
AVHGtoJ2ZYT4HxDZQ32KpgWPtvaWQt5Fml5N0ktH80Iulttj0RzLpbFLfy8AIteS
P7VhiOJFwW5+LzTYfAdoEYaHCNabHrdc1kfbGdpmvavL51GzapskvUsJMpaWsoiw
ipig6WUnxodcye+eW72WbhH9SHop99wOVwmk948H/D8O4uQSml86rMTpt4B19JBH
ZC+XJQaiN/6hA0kQ8UhXJzYlKO7NjOQSs3sshplng+pdKSBj69PcaT/5OKLeefRF
64ooO4p5QgOTTNqr52DcOMpuqAFcg4ZG54Vr8VPIefTJEAWw9JPgw0oXHRc6FILn
81I1i1nJGO6Fx5ZEVnKhZz44TrvDHXDmgfku4uwp3b598HO79kI=
=I9UI
-----END PGP SIGNATURE-----
--- End Message ---
