As required by aron.
From c552e462652bebf413812e761c71af8e09aeaf67 Mon Sep 17 00:00:00 2001
From: Zhou Mo <cdlumin...@gmail.com>
Date: Sat, 17 Sep 2016 16:54:20 +0000
Subject: [PATCH 1/4] dch: import upstream release 0.6.5.8
---
changelog | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/changelog b/changelog
index 57a60c1..ed38d2d 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+zfs-linux (0.6.5.8-0.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * New upstream release.
+
+ -- Zhou Mo <cdlumin...@gmail.com> Sat, 17 Sep 2016 16:11:07 +0000
+
zfs-linux (0.6.5.7-2) unstable; urgency=medium
[ Aron Xu ]
--
2.9.3
From 5697aaa98dd0cda3b878d637c12427cdbf3f89ad Mon Sep 17 00:00:00 2001
From: Zhou Mo <cdlumin...@gmail.com>
Date: Sat, 17 Sep 2016 16:56:07 +0000
Subject: [PATCH 2/4] patches: removed merged patches
---
changelog | 4 ++
.../1003-Add-tunable-to-ignore-hole_birth.patch | 63 ----------------------
patches/1004-ignore-hole_birth-by-default.patch | 20 -------
patches/series | 2 -
4 files changed, 4 insertions(+), 85 deletions(-)
delete mode 100644 patches/1003-Add-tunable-to-ignore-hole_birth.patch
delete mode 100644 patches/1004-ignore-hole_birth-by-default.patch
diff --git a/changelog b/changelog
index ed38d2d..cd82551 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,10 @@ zfs-linux (0.6.5.8-0.1) unstable; urgency=medium
* Non-maintainer upload.
* New upstream release.
+ * Remove merged patches:
+ - 1003-Add-tunable-to-ignore-hole_birth.patch
+ - 1004-ignore-hole_birth-by-default.patch
+
-- Zhou Mo <cdlumin...@gmail.com> Sat, 17 Sep 2016 16:11:07 +0000
diff --git a/patches/1003-Add-tunable-to-ignore-hole_birth.patch b/patches/1003-Add-tunable-to-ignore-hole_birth.patch
deleted file mode 100644
index 3fed916..0000000
--- a/patches/1003-Add-tunable-to-ignore-hole_birth.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Description: Add tunable to ignore hole_birth.
- Adds a module option which disables the hole_birth optimization
- which has been responsible for several recent bugs, including
- issue https://github.com/zfsonlinux/zfs/issues/4050.
-Forwarded: https://github.com/zfsonlinux/zfs/pull/4833
-Author: Rich Ercolani <rincebr...@gmail.com>
-Reviewed-By: Brian Behlendorf <behlendo...@llnl.gov>
-Applied-Upstream: 6d836e6f8b358270d55a57ad8e8868c957f15bf3 (master commit)
-Last-Update: 2016-08-16
----
- man/man5/zfs-module-parameters.5 | 13 +++++++++++++
- module/zfs/dmu_traverse.c | 6 +++++-
- 2 files changed, 18 insertions(+), 1 deletion(-)
-
---- a/man/man5/zfs-module-parameters.5
-+++ b/man/man5/zfs-module-parameters.5
-@@ -27,6 +27,19 @@
- .sp
- .ne 2
- .na
-+\fBignore_hole_birth\fR (int)
-+.ad
-+.RS 12n
-+When set, the hole_birth optimization will not be used, and all holes will
-+always be sent on zfs send. Useful if you suspect your datasets are affected
-+by a bug in hole_birth.
-+.sp
-+Use \fB1\fR for on and \fB0\fR (default) for off.
-+.RE
-+
-+.sp
-+.ne 2
-+.na
- \fBl2arc_feed_again\fR (int)
- .ad
- .RS 12n
---- a/module/zfs/dmu_traverse.c
-+++ b/module/zfs/dmu_traverse.c
-@@ -39,6 +39,7 @@
- #include <sys/zfeature.h>
-
- int32_t zfs_pd_bytes_max = 50 * 1024 * 1024; /* 50MB */
-+int32_t ignore_hole_birth = 0;
-
- typedef struct prefetch_data {
- kmutex_t pd_mtx;
-@@ -250,7 +251,7 @@
- *
- * Note that the meta-dnode cannot be reallocated.
- */
-- if ((!td->td_realloc_possible ||
-+ if (!ignore_hole_birth && (!td->td_realloc_possible ||
- zb->zb_object == DMU_META_DNODE_OBJECT) &&
- td->td_hole_birth_enabled_txg <= td->td_min_txg)
- return (0);
-@@ -692,4 +693,7 @@
-
- module_param(zfs_pd_bytes_max, int, 0644);
- MODULE_PARM_DESC(zfs_pd_bytes_max, "Max number of bytes to prefetch");
-+
-+module_param(ignore_hole_birth, int, 0644);
-+MODULE_PARM_DESC(ignore_hole_birth, "Ignore hole_birth txg for send");
- #endif
diff --git a/patches/1004-ignore-hole_birth-by-default.patch b/patches/1004-ignore-hole_birth-by-default.patch
deleted file mode 100644
index 5eed797..0000000
--- a/patches/1004-ignore-hole_birth-by-default.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Enable by default the tunable to ignore hole_birth.
- Once hole_birth becomes more reliable, this patch should be
- removed, making the tunable default back to false.
-Bug: https://github.com/zfsonlinux/zfs/issues/4050
-Bug-Debian: https://bugs.debian.org/830824
-Forwarded: https://github.com/zfsonlinux/zfs/pull/4833
-Author: Carlos Alberto Lopez Perez <clo...@igalia.com>
-Last-Update: 2016-08-16
-
---- a/module/zfs/dmu_traverse.c
-+++ b/module/zfs/dmu_traverse.c
-@@ -39,7 +39,7 @@
- #include <sys/zfeature.h>
-
- int32_t zfs_pd_bytes_max = 50 * 1024 * 1024; /* 50MB */
--int32_t ignore_hole_birth = 0;
-+int32_t ignore_hole_birth = 1;
-
- typedef struct prefetch_data {
- kmutex_t pd_mtx;
diff --git a/patches/series b/patches/series
index d9fac31..26e7ae3 100644
--- a/patches/series
+++ b/patches/series
@@ -4,5 +4,3 @@
1000-ppc64el-endian-support.patch
1002-fix-mips-build.patch
enable-zed.patch
-1003-Add-tunable-to-ignore-hole_birth.patch
-1004-ignore-hole_birth-by-default.patch
--
2.9.3
From fda1954ee3098df92589a7a4d95e01b89ff661fd Mon Sep 17 00:00:00 2001
From: Zhou Mo <cdlumin...@gmail.com>
Date: Sat, 17 Sep 2016 16:57:04 +0000
Subject: [PATCH 3/4] rules: override dh_fixperms to avoid lintianW
---
changelog | 3 ++-
rules | 4 ++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/changelog b/changelog
index cd82551..ef8e7d6 100644
--- a/changelog
+++ b/changelog
@@ -5,7 +5,8 @@ zfs-linux (0.6.5.8-0.1) unstable; urgency=medium
* Remove merged patches:
- 1003-Add-tunable-to-ignore-hole_birth.patch
- 1004-ignore-hole_birth-by-default.patch
-
+ * Override dh_fixperms to remove executable bit for dsl_pool.c, eliminating
+ lintian warning.
-- Zhou Mo <cdlumin...@gmail.com> Sat, 17 Sep 2016 16:11:07 +0000
diff --git a/rules b/rules
index 5036f42..08cf981 100755
--- a/rules
+++ b/rules
@@ -139,6 +139,10 @@ override_dh_install:
find . -name lib*.la -delete
dh_install --list-missing
+override_dh_fixperms:
+ dh_fixperms
+ find debian -type f -name dsl_pool.c -exec chmod -x {} + # fixes lintianW
+
# ------------
override_dh_prep-deb-files:
--
2.9.3
From 52637a3ff7a5587a6a4500dcb5b95d5800a754c8 Mon Sep 17 00:00:00 2001
From: Zhou Mo <cdlumin...@gmail.com>
Date: Sat, 17 Sep 2016 17:02:08 +0000
Subject: [PATCH 4/4] install zfs-zed.service as zed.service
---
changelog | 1 +
zfs-zed.install | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/changelog b/changelog
index ef8e7d6..ad692e1 100644
--- a/changelog
+++ b/changelog
@@ -7,6 +7,7 @@ zfs-linux (0.6.5.8-0.1) unstable; urgency=medium
- 1004-ignore-hole_birth-by-default.patch
* Override dh_fixperms to remove executable bit for dsl_pool.c, eliminating
lintian warning.
+ * Install zfs-zed.service as zed.service .
-- Zhou Mo <cdlumin...@gmail.com> Sat, 17 Sep 2016 16:11:07 +0000
diff --git a/zfs-zed.install b/zfs-zed.install
index 01ba18a..f53bdf6 100644
--- a/zfs-zed.install
+++ b/zfs-zed.install
@@ -1,5 +1,5 @@
sbin/zed
etc/zfs/zed.d/*
usr/lib/*/zfs/zed.d/*
-usr/lib/systemd/system/zed.service lib/systemd/system/
+usr/lib/systemd/system/zfs-zed.service lib/systemd/system/zed.service
usr/share/man/man8/zed.8
--
2.9.3
