Bug#838140: RFS: zfs-linux/0.6.5.8-0.1 [NMU] -- git format-patch -- version 4

2016-09-19 Thread lumin 
On Tue, 2016-09-20 at 04:29 +0800, Aron Xu wrote:
> 
> Hi,
> 
> I still have question on your patchset:
> 
> 1. There is no need to override dh_fixperm explicitly for this
> warning, this should be fixed upstream to remove the executable bit.

Ok, got it.

> 
> 2. From what I read the disabled status of zfs-import-scan.service is
> intended, I wonder if this is preventing mounts when ZFS is used as
> rootfs (so you make it enabled explicitly):
> https://github.com/zfsonlinux/zfs/commit/92547bc45ca9a2114662d9343ae5
> 3e5098acb627

Well, this 'enable zfs-import-scan' change is due to my
misunderstanding
in previous discussion, however it's my fault not to check
upstream document about the reason why that default was made.

My root is still ext4 so I cannot verify zfs-initramfs behaviour.

> 
> Thanks,
> Aron

Bug#838140: RFS: zfs-linux/0.6.5.8-0.1 [NMU] -- git format-patch -- version 4

2016-09-19 Thread Aron Xu 
Hi,

I still have question on your patchset:

1. There is no need to override dh_fixperm explicitly for this
warning, this should be fixed upstream to remove the executable bit.
2. From what I read the disabled status of zfs-import-scan.service is
intended, I wonder if this is preventing mounts when ZFS is used as
rootfs (so you make it enabled explicitly):
https://github.com/zfsonlinux/zfs/commit/92547bc45ca9a2114662d9343ae53e5098acb627

Thanks,
Aron

On Sun, Sep 18, 2016 at 10:50 PM, lumin  wrote:
> Hi,
>
> I refreshed the whole patch stack, with some new changes added.
>
> * add a patch to enable zfs-import-scan.service by default.
>   in 0.6.5.7 all zfs services are enabled, and in 0.6.5.8 all
>   services are enabled by upstream except for zfs-import-scan.
>
> * add the missing zfs.target .

Bug#838140: RFS: zfs-linux/0.6.5.8-0.1 [NMU] -- git format-patch -- version 4

2016-09-18 Thread lumin 
Hi,

I refreshed the whole patch stack, with some new changes added.

* add a patch to enable zfs-import-scan.service by default.
  in 0.6.5.7 all zfs services are enabled, and in 0.6.5.8 all
  services are enabled by upstream except for zfs-import-scan.

* add the missing zfs.target .From 2878754d162ec1e8ad11447b5eadc9d19036e3b3 Mon Sep 17 00:00:00 2001
From: Zhou Mo 
Date: Sun, 18 Sep 2016 14:23:43 +
Subject: [PATCH 1/5] Patch: remove merged patches.

  - 1003-Add-tunable-to-ignore-hole_birth.patch
  - 1004-ignore-hole_birth-by-default.patch
---
 .../1003-Add-tunable-to-ignore-hole_birth.patch| 63 --
 .../1004-ignore-hole_birth-by-default.patch| 20 ---
 debian/patches/series  |  2 -
 3 files changed, 85 deletions(-)
 delete mode 100644 debian/patches/1003-Add-tunable-to-ignore-hole_birth.patch
 delete mode 100644 debian/patches/1004-ignore-hole_birth-by-default.patch

diff --git a/debian/patches/1003-Add-tunable-to-ignore-hole_birth.patch b/debian/patches/1003-Add-tunable-to-ignore-hole_birth.patch
deleted file mode 100644
index 3fed916..000
--- a/debian/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 
-Reviewed-By: Brian Behlendorf 
-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 
- 
- 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/debian/patches/1004-ignore-hole_birth-by-default.patch b/debian/patches/1004-ignore-hole_birth-by-default.patch
deleted file mode 100644
index 5eed797..000
--- a/debian/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 
-Last-Update: 2016-08-16
-
 a/module/zfs/dmu_traverse.c
-+++ b/module/zfs/dmu_traverse.c
-@@ -39,7 +39,7 @@
- #include 
- 
- 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/debian/patches/series b/debian/patches/series
index d9fac31..26e7ae3 100644
--- a/debian/patches/series
+++ b/debian/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 8256e109fd4123f4fd84f905dc9dc8b717714061 Mon Sep 17 00:00:00 2001
From: Zhou Mo 
Date: Sun, 18 Sep 2016 14:25:04 +
Subject: [PATCH 2/5] Override dh_fixperms, which fixes a lintian warning.

---
 debian/rules | 4 
 1 file changed, 4 insertions(+)

diff --git a/debian/rules b/debian/rules
index 5036f42..08cf981 100755
--- a/debian/rules
+++ b/debian/rules
@@ -139,6 +139,10 @@ override_dh_install:
 	find . -name lib*.la -delete
 	dh_install