diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2014-03-10 13:38:57 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2014-03-10 14:38:46 +0400 |
| commit | 6405fb317e26b7d5f87a77846c52896c648d917a (patch) | |
| tree | 57fd7dc158d04776dbd79c67e35339ad8015d3a4 | |
| parent | 07dfcee9ce34210dc144ddf78418c393a4954cce (diff) | |
| download | illumos-packaging-6405fb317e26b7d5f87a77846c52896c648d917a.tar.gz | |
zfsutils (4.3) UNRELEASED; urgency=medium
* New upstream snapshot
* Updated patches
* Added uts-zfs-NULL-0.patch
* Added uts-zfs-libsunavl.patch
* Added libzpool-zfs.h.patch
33 files changed, 311 insertions, 252 deletions
diff --git a/zfsutils/debian/changelog b/zfsutils/debian/changelog index 34e5c1f..14435d7 100644 --- a/zfsutils/debian/changelog +++ b/zfsutils/debian/changelog @@ -1,3 +1,12 @@ +zfsutils (4.3) UNRELEASED; urgency=medium + + * New upstream snapshot + * Updated patches + * Added uts-zfs-NULL-0.patch + * Added uts-zfs-libsunavl.patch + + -- Igor Pashev <pashev.igor@gmail.com> Mon, 10 Mar 2014 12:28:21 +0400 + zfsutils (2.10-4) unstable; urgency=low * Switched to libsunavl2 diff --git a/zfsutils/debian/control b/zfsutils/debian/control index c45735f..ac50030 100644 --- a/zfsutils/debian/control +++ b/zfsutils/debian/control @@ -5,8 +5,8 @@ Maintainer: Igor Pashev <pashev.igor@gmail.com> Build-Depends: dh-illumos, gcc-multilib, - illumos-source-2.10, - uts-dev (>= 2.10), + illumos-source-4.3, + uts-dev (>= 4.3), libdevid1-dev , lib32devid1-dev [illumos-amd64] , libdevid1-dev , lib32devid1-dev [illumos-amd64] , libdevinfo1-dev , lib32devinfo1-dev [illumos-amd64] , diff --git a/zfsutils/debian/patches/libdiskmgt-NULL-0.patch b/zfsutils/debian/patches/libdiskmgt-NULL-0.patch index 26d6298..01691d3 100644 --- a/zfsutils/debian/patches/libdiskmgt-NULL-0.patch +++ b/zfsutils/debian/patches/libdiskmgt-NULL-0.patch @@ -1,7 +1,7 @@ -Index: libdiskmgt/usr/src/lib/libdiskmgt/common/events.c +Index: b/usr/src/lib/libdiskmgt/common/events.c =================================================================== ---- libdiskmgt.orig/usr/src/lib/libdiskmgt/common/events.c 2012-10-08 00:25:38.000000000 +0000 -+++ libdiskmgt/usr/src/lib/libdiskmgt/common/events.c 2012-11-11 21:23:56.390570714 +0000 +--- a/usr/src/lib/libdiskmgt/common/events.c 2014-03-10 12:36:45.302314494 +0400 ++++ b/usr/src/lib/libdiskmgt/common/events.c 2014-03-10 12:37:29.244888102 +0400 @@ -151,7 +151,7 @@ /* installing a cb; we didn't have one before */ thread_t watch_thread; diff --git a/zfsutils/debian/patches/libdiskmgt-avoid-libadm.patch b/zfsutils/debian/patches/libdiskmgt-avoid-libadm.patch index 14224f8..1929f23 100644 --- a/zfsutils/debian/patches/libdiskmgt-avoid-libadm.patch +++ b/zfsutils/debian/patches/libdiskmgt-avoid-libadm.patch @@ -1,7 +1,7 @@ -Index: zfsutils/usr/src/lib/libdiskmgt/Makefile.com +Index: b/usr/src/lib/libdiskmgt/Makefile.com =================================================================== ---- zfsutils.orig/usr/src/lib/libdiskmgt/Makefile.com 2012-10-08 00:25:38.000000000 +0000 -+++ zfsutils/usr/src/lib/libdiskmgt/Makefile.com 2012-11-12 00:06:13.670947070 +0000 +--- a/usr/src/lib/libdiskmgt/Makefile.com 2014-03-10 12:36:45.832206397 +0400 ++++ b/usr/src/lib/libdiskmgt/Makefile.com 2014-03-10 12:37:26.611448056 +0400 @@ -29,20 +29,28 @@ entry.o cache.o drive.o controller.o alias.o path.o \ media.o slice.o partition.o findevs.o events.o \ @@ -34,11 +34,11 @@ Index: zfsutils/usr/src/lib/libdiskmgt/Makefile.com CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-parentheses -Index: zfsutils/usr/src/lib/libdiskmgt/common/disks_private.h +Index: b/usr/src/lib/libdiskmgt/common/disks_private.h =================================================================== ---- zfsutils.orig/usr/src/lib/libdiskmgt/common/disks_private.h 2012-10-08 00:25:38.000000000 +0000 -+++ zfsutils/usr/src/lib/libdiskmgt/common/disks_private.h 2012-11-11 23:49:29.508524063 +0000 -@@ -34,6 +34,7 @@ +--- a/usr/src/lib/libdiskmgt/common/disks_private.h 2014-03-10 12:36:45.832165291 +0400 ++++ b/usr/src/lib/libdiskmgt/common/disks_private.h 2014-03-10 12:37:26.613660941 +0400 +@@ -32,6 +32,7 @@ #include <libdevinfo.h> #include <sys/dkio.h> @@ -46,7 +46,7 @@ Index: zfsutils/usr/src/lib/libdiskmgt/common/disks_private.h #include <devid.h> #define DM_DEBUG "DM_LIBDISKMGT_DEBUG" -@@ -144,6 +145,11 @@ +@@ -143,6 +144,11 @@ } dm_event_type_t; @@ -58,10 +58,10 @@ Index: zfsutils/usr/src/lib/libdiskmgt/common/disks_private.h /* private internal functions */ descriptor_t **alias_get_descriptors(int filter[], int *errp); descriptor_t **alias_get_assoc_descriptors(descriptor_t *desc, -Index: zfsutils/usr/src/lib/libadm/common/fulldevnm.c +Index: b/usr/src/lib/libadm/common/fulldevnm.c =================================================================== ---- zfsutils.orig/usr/src/lib/libadm/common/fulldevnm.c 2012-10-08 00:25:37.000000000 +0000 -+++ zfsutils/usr/src/lib/libadm/common/fulldevnm.c 2012-11-12 00:25:08.643681900 +0000 +--- a/usr/src/lib/libadm/common/fulldevnm.c 2014-03-10 12:36:45.832109801 +0400 ++++ b/usr/src/lib/libadm/common/fulldevnm.c 2014-03-10 12:37:26.615483966 +0400 @@ -40,7 +40,6 @@ #include <sys/lofi.h> #include <sys/ramdisk.h> diff --git a/zfsutils/debian/patches/libdiskmgt-avoid-meta.h.patch b/zfsutils/debian/patches/libdiskmgt-avoid-meta.h.patch index aea9be7..5e9e857 100644 --- a/zfsutils/debian/patches/libdiskmgt-avoid-meta.h.patch +++ b/zfsutils/debian/patches/libdiskmgt-avoid-meta.h.patch @@ -1,7 +1,7 @@ -Index: libdiskmgt/usr/src/lib/libdiskmgt/common/inuse_svm.c +Index: b/usr/src/lib/libdiskmgt/common/inuse_svm.c =================================================================== ---- libdiskmgt.orig/usr/src/lib/libdiskmgt/common/inuse_svm.c 2012-10-08 00:25:38.000000000 +0000 -+++ libdiskmgt/usr/src/lib/libdiskmgt/common/inuse_svm.c 2012-11-11 23:20:11.644213024 +0000 +--- a/usr/src/lib/libdiskmgt/common/inuse_svm.c 2014-03-10 12:36:44.749171360 +0400 ++++ b/usr/src/lib/libdiskmgt/common/inuse_svm.c 2014-03-10 12:37:31.366875570 +0400 @@ -29,7 +29,6 @@ * Creates and maintains a cache of slices used by SVM. */ diff --git a/zfsutils/debian/patches/libdiskmgt-time.patch b/zfsutils/debian/patches/libdiskmgt-time.patch index 18eee65..74a8058 100644 --- a/zfsutils/debian/patches/libdiskmgt-time.patch +++ b/zfsutils/debian/patches/libdiskmgt-time.patch @@ -1,7 +1,7 @@ -Index: libdiskmgt/usr/src/lib/libdiskmgt/common/inuse_lu.c +Index: b/usr/src/lib/libdiskmgt/common/inuse_lu.c =================================================================== ---- libdiskmgt.orig/usr/src/lib/libdiskmgt/common/inuse_lu.c 2012-10-08 00:25:38.000000000 +0000 -+++ libdiskmgt/usr/src/lib/libdiskmgt/common/inuse_lu.c 2012-11-11 23:24:33.680655689 +0000 +--- a/usr/src/lib/libdiskmgt/common/inuse_lu.c 2014-03-10 12:36:44.221472022 +0400 ++++ b/usr/src/lib/libdiskmgt/common/inuse_lu.c 2014-03-10 12:37:33.514244314 +0400 @@ -33,6 +33,7 @@ #include <dirent.h> #include <stdlib.h> @@ -10,10 +10,10 @@ Index: libdiskmgt/usr/src/lib/libdiskmgt/common/inuse_lu.c #include <string.h> #include <synch.h> #include <sys/errno.h> -Index: libdiskmgt/usr/src/lib/libdiskmgt/common/inuse_fs.c +Index: b/usr/src/lib/libdiskmgt/common/inuse_fs.c =================================================================== ---- libdiskmgt.orig/usr/src/lib/libdiskmgt/common/inuse_fs.c 2012-10-08 00:25:38.000000000 +0000 -+++ libdiskmgt/usr/src/lib/libdiskmgt/common/inuse_fs.c 2012-11-11 23:25:33.727249736 +0000 +--- a/usr/src/lib/libdiskmgt/common/inuse_fs.c 2014-03-10 12:36:44.221416763 +0400 ++++ b/usr/src/lib/libdiskmgt/common/inuse_fs.c 2014-03-10 12:37:33.515495454 +0400 @@ -31,6 +31,7 @@ #include <string.h> #include <synch.h> @@ -22,10 +22,10 @@ Index: libdiskmgt/usr/src/lib/libdiskmgt/common/inuse_fs.c #include <sys/errno.h> #include <sys/types.h> #include <sys/stat.h> -Index: libdiskmgt/usr/src/lib/libdiskmgt/common/inuse_vxvm.c +Index: b/usr/src/lib/libdiskmgt/common/inuse_vxvm.c =================================================================== ---- libdiskmgt.orig/usr/src/lib/libdiskmgt/common/inuse_vxvm.c 2012-10-08 00:25:38.000000000 +0000 -+++ libdiskmgt/usr/src/lib/libdiskmgt/common/inuse_vxvm.c 2012-11-11 23:26:14.518928300 +0000 +--- a/usr/src/lib/libdiskmgt/common/inuse_vxvm.c 2014-03-10 12:36:44.221501507 +0400 ++++ b/usr/src/lib/libdiskmgt/common/inuse_vxvm.c 2014-03-10 12:37:33.516608155 +0400 @@ -32,6 +32,7 @@ #include <stdlib.h> #include <stdio.h> diff --git a/zfsutils/debian/patches/libzfs-NULL-0.patch b/zfsutils/debian/patches/libzfs-NULL-0.patch index 995b080..9bc2f17 100644 --- a/zfsutils/debian/patches/libzfs-NULL-0.patch +++ b/zfsutils/debian/patches/libzfs-NULL-0.patch @@ -1,8 +1,8 @@ -Index: zfsutils/usr/src/lib/libzfs/common/libzfs_dataset.c +Index: b/usr/src/lib/libzfs/common/libzfs_dataset.c =================================================================== ---- zfsutils.orig/usr/src/lib/libzfs/common/libzfs_dataset.c 2012-11-11 01:16:47.674304441 +0000 -+++ zfsutils/usr/src/lib/libzfs/common/libzfs_dataset.c 2012-11-11 01:16:47.952304162 +0000 -@@ -3952,7 +3952,7 @@ +--- a/usr/src/lib/libzfs/common/libzfs_dataset.c 2014-03-10 12:37:02.425815711 +0400 ++++ b/usr/src/lib/libzfs/common/libzfs_dataset.c 2014-03-10 12:37:04.618872674 +0400 +@@ -4041,7 +4041,7 @@ if (cmd == ZFS_SMB_ACL_RENAME) { if (nvlist_alloc(&nvlist, NV_UNIQUE_NAME, 0) != 0) { (void) no_memory(hdl); @@ -11,11 +11,11 @@ Index: zfsutils/usr/src/lib/libzfs/common/libzfs_dataset.c } } -Index: zfsutils/usr/src/lib/libzfs/common/libzfs_sendrecv.c +Index: b/usr/src/lib/libzfs/common/libzfs_sendrecv.c =================================================================== ---- zfsutils.orig/usr/src/lib/libzfs/common/libzfs_sendrecv.c 2012-10-08 00:25:42.000000000 +0000 -+++ zfsutils/usr/src/lib/libzfs/common/libzfs_sendrecv.c 2012-11-11 02:27:04.647877746 +0000 -@@ -2668,7 +2668,7 @@ +--- a/usr/src/lib/libzfs/common/libzfs_sendrecv.c 2014-03-10 12:36:54.935778718 +0400 ++++ b/usr/src/lib/libzfs/common/libzfs_sendrecv.c 2014-03-10 12:37:04.622296500 +0400 +@@ -2718,7 +2718,7 @@ (void) printf("found clone origin %s\n", zc.zc_string); } diff --git a/zfsutils/debian/patches/libzfs-avoid-libadm.patch b/zfsutils/debian/patches/libzfs-avoid-libadm.patch index 85077cf..c937196 100644 --- a/zfsutils/debian/patches/libzfs-avoid-libadm.patch +++ b/zfsutils/debian/patches/libzfs-avoid-libadm.patch @@ -1,7 +1,7 @@ -Index: zfsutils/usr/src/lib/libzfs/Makefile.com +Index: b/usr/src/lib/libzfs/Makefile.com =================================================================== ---- zfsutils.orig/usr/src/lib/libzfs/Makefile.com 2012-11-11 19:14:48.484144483 +0000 -+++ zfsutils/usr/src/lib/libzfs/Makefile.com 2012-11-11 19:21:22.767996007 +0000 +--- a/usr/src/lib/libzfs/Makefile.com 2014-03-10 12:36:46.984160807 +0400 ++++ b/usr/src/lib/libzfs/Makefile.com 2014-03-10 12:37:24.244175855 +0400 @@ -51,6 +51,7 @@ libzfs_util.o @@ -28,10 +28,10 @@ Index: zfsutils/usr/src/lib/libzfs/Makefile.com + $(POST_PROCESS_O) + include ../../Makefile.targ -Index: zfsutils/usr/src/lib/libzfs/common/libzfs_import.c +Index: b/usr/src/lib/libzfs/common/libzfs_import.c =================================================================== ---- zfsutils.orig/usr/src/lib/libzfs/common/libzfs_import.c 2012-11-11 19:14:48.483759867 +0000 -+++ zfsutils/usr/src/lib/libzfs/common/libzfs_import.c 2012-11-11 19:26:24.491372941 +0000 +--- a/usr/src/lib/libzfs/common/libzfs_import.c 2014-03-10 12:36:46.984413914 +0400 ++++ b/usr/src/lib/libzfs/common/libzfs_import.c 2014-03-10 12:37:24.246913153 +0400 @@ -61,6 +61,11 @@ #include "libzfs.h" #include "libzfs_impl.h" diff --git a/zfsutils/debian/patches/libzfs-dataset.c-time.h.patch b/zfsutils/debian/patches/libzfs-dataset.c-time.h.patch index f4b4ce4..ea15576 100644 --- a/zfsutils/debian/patches/libzfs-dataset.c-time.h.patch +++ b/zfsutils/debian/patches/libzfs-dataset.c-time.h.patch @@ -1,8 +1,8 @@ -Index: zfsutils/usr/src/lib/libzfs/common/libzfs_dataset.c +Index: b/usr/src/lib/libzfs/common/libzfs_dataset.c =================================================================== ---- zfsutils.orig/usr/src/lib/libzfs/common/libzfs_dataset.c 2012-11-11 18:50:42.848747500 +0000 -+++ zfsutils/usr/src/lib/libzfs/common/libzfs_dataset.c 2012-11-11 18:52:59.794494134 +0000 -@@ -44,6 +44,7 @@ +--- a/usr/src/lib/libzfs/common/libzfs_dataset.c 2014-03-10 12:37:04.618872674 +0400 ++++ b/usr/src/lib/libzfs/common/libzfs_dataset.c 2014-03-10 12:37:19.966097423 +0400 +@@ -46,6 +46,7 @@ #include <pwd.h> #include <grp.h> #include <stddef.h> diff --git a/zfsutils/debian/patches/libzfs-libshare-can-be-missed.patch b/zfsutils/debian/patches/libzfs-libshare-can-be-missed.patch index 7d7b661..2d2a30e 100644 --- a/zfsutils/debian/patches/libzfs-libshare-can-be-missed.patch +++ b/zfsutils/debian/patches/libzfs-libshare-can-be-missed.patch @@ -4,10 +4,10 @@ Description: do not return error if libshare is missed cannot share 'new': : share(1M) failed # echo $? 1 -Index: zfsutils/usr/src/lib/libzfs/common/libzfs_mount.c +Index: b/usr/src/lib/libzfs/common/libzfs_mount.c =================================================================== ---- zfsutils.orig/usr/src/lib/libzfs/common/libzfs_mount.c 2012-10-08 00:25:42.000000000 +0000 -+++ zfsutils/usr/src/lib/libzfs/common/libzfs_mount.c 2013-04-07 20:36:06.231920806 +0000 +--- a/usr/src/lib/libzfs/common/libzfs_mount.c 2014-03-10 12:36:39.448020567 +0400 ++++ b/usr/src/lib/libzfs/common/libzfs_mount.c 2014-03-10 12:37:52.162535429 +0400 @@ -716,11 +716,15 @@ return (0); diff --git a/zfsutils/debian/patches/libzfs-libsunavl.patch b/zfsutils/debian/patches/libzfs-libsunavl.patch index eb3ed85..209ba28 100644 --- a/zfsutils/debian/patches/libzfs-libsunavl.patch +++ b/zfsutils/debian/patches/libzfs-libsunavl.patch @@ -1,7 +1,7 @@ -Index: zfsutils/usr/src/lib/libzfs/Makefile.com +Index: b/usr/src/lib/libzfs/Makefile.com =================================================================== ---- zfsutils.orig/usr/src/lib/libzfs/Makefile.com 2013-04-07 20:46:37.486644139 +0000 -+++ zfsutils/usr/src/lib/libzfs/Makefile.com 2013-04-07 20:47:28.033402985 +0000 +--- a/usr/src/lib/libzfs/Makefile.com 2014-03-10 12:37:24.244175855 +0400 ++++ b/usr/src/lib/libzfs/Makefile.com 2014-03-10 12:37:54.354369003 +0400 @@ -69,7 +69,7 @@ C99MODE= -xc99=%all @@ -11,11 +11,11 @@ Index: zfsutils/usr/src/lib/libzfs/Makefile.com -lidmap -ltsol -lmd -lumem -lzfs_core CPPFLAGS += $(INCS) -D_LARGEFILE64_SOURCE=1 -D_REENTRANT -Index: zfsutils/usr/src/lib/libzfs/common/libzfs_dataset.c +Index: b/usr/src/lib/libzfs/common/libzfs_dataset.c =================================================================== ---- zfsutils.orig/usr/src/lib/libzfs/common/libzfs_dataset.c 2013-04-07 20:46:37.486467407 +0000 -+++ zfsutils/usr/src/lib/libzfs/common/libzfs_dataset.c 2013-04-07 20:47:28.040297195 +0000 -@@ -49,6 +49,7 @@ +--- a/usr/src/lib/libzfs/common/libzfs_dataset.c 2014-03-10 12:37:19.966097423 +0400 ++++ b/usr/src/lib/libzfs/common/libzfs_dataset.c 2014-03-10 12:37:54.361193494 +0400 +@@ -51,6 +51,7 @@ #include <idmap.h> #include <aclutils.h> #include <directory.h> @@ -23,10 +23,10 @@ Index: zfsutils/usr/src/lib/libzfs/common/libzfs_dataset.c #include <sys/dnode.h> #include <sys/spa.h> -Index: zfsutils/usr/src/lib/libzfs/common/libzfs_import.c +Index: b/usr/src/lib/libzfs/common/libzfs_import.c =================================================================== ---- zfsutils.orig/usr/src/lib/libzfs/common/libzfs_import.c 2013-04-07 20:46:37.486582839 +0000 -+++ zfsutils/usr/src/lib/libzfs/common/libzfs_import.c 2013-04-07 20:47:28.043076781 +0000 +--- a/usr/src/lib/libzfs/common/libzfs_import.c 2014-03-10 12:37:24.246913153 +0400 ++++ b/usr/src/lib/libzfs/common/libzfs_import.c 2014-03-10 12:37:54.363921829 +0400 @@ -45,6 +45,7 @@ #include <dirent.h> #include <errno.h> @@ -35,10 +35,10 @@ Index: zfsutils/usr/src/lib/libzfs/common/libzfs_import.c #include <stddef.h> #include <stdlib.h> #include <string.h> -Index: zfsutils/usr/src/lib/libzfs/common/libzfs_iter.c +Index: b/usr/src/lib/libzfs/common/libzfs_iter.c =================================================================== ---- zfsutils.orig/usr/src/lib/libzfs/common/libzfs_iter.c 2013-04-07 20:46:37.486526439 +0000 -+++ zfsutils/usr/src/lib/libzfs/common/libzfs_iter.c 2013-04-07 20:47:28.044914656 +0000 +--- a/usr/src/lib/libzfs/common/libzfs_iter.c 2014-03-10 12:36:38.883805227 +0400 ++++ b/usr/src/lib/libzfs/common/libzfs_iter.c 2014-03-10 12:37:54.365436565 +0400 @@ -31,6 +31,7 @@ #include <unistd.h> #include <stddef.h> @@ -47,11 +47,11 @@ Index: zfsutils/usr/src/lib/libzfs/common/libzfs_iter.c #include <libzfs.h> #include "libzfs_impl.h" -Index: zfsutils/usr/src/lib/libzfs/common/libzfs_sendrecv.c +Index: b/usr/src/lib/libzfs/common/libzfs_sendrecv.c =================================================================== ---- zfsutils.orig/usr/src/lib/libzfs/common/libzfs_sendrecv.c 2013-04-07 20:46:37.486611883 +0000 -+++ zfsutils/usr/src/lib/libzfs/common/libzfs_sendrecv.c 2013-04-07 20:47:57.934905842 +0000 -@@ -29,6 +29,7 @@ +--- a/usr/src/lib/libzfs/common/libzfs_sendrecv.c 2014-03-10 12:37:04.622296500 +0400 ++++ b/usr/src/lib/libzfs/common/libzfs_sendrecv.c 2014-03-10 12:37:54.368614368 +0400 +@@ -30,6 +30,7 @@ #include <ctype.h> #include <errno.h> #include <libintl.h> diff --git a/zfsutils/debian/patches/libzfs-libtsol.patch b/zfsutils/debian/patches/libzfs-libtsol.patch index f6e07ba..28281b3 100644 --- a/zfsutils/debian/patches/libzfs-libtsol.patch +++ b/zfsutils/debian/patches/libzfs-libtsol.patch @@ -1,8 +1,8 @@ -Index: zfsutils/usr/src/lib/libzfs/common/libzfs_dataset.c +Index: b/usr/src/lib/libzfs/common/libzfs_dataset.c =================================================================== ---- zfsutils.orig/usr/src/lib/libzfs/common/libzfs_dataset.c 2012-10-08 00:25:42.000000000 +0000 -+++ zfsutils/usr/src/lib/libzfs/common/libzfs_dataset.c 2012-11-11 00:01:07.208754600 +0000 -@@ -37,6 +37,7 @@ +--- a/usr/src/lib/libzfs/common/libzfs_dataset.c 2014-03-10 12:36:56.019892493 +0400 ++++ b/usr/src/lib/libzfs/common/libzfs_dataset.c 2014-03-10 12:37:02.425815711 +0400 +@@ -39,6 +39,7 @@ #include <stddef.h> #include <zone.h> #include <fcntl.h> diff --git a/zfsutils/debian/patches/libzpool-arc.c-NULL-0.patch b/zfsutils/debian/patches/libzpool-arc.c-NULL-0.patch index 8b40428..831bed0 100644 --- a/zfsutils/debian/patches/libzpool-arc.c-NULL-0.patch +++ b/zfsutils/debian/patches/libzpool-arc.c-NULL-0.patch @@ -1,23 +1,8 @@ -Index: zfsutils/usr/src/uts/common/fs/zfs/arc.c +Index: b/usr/src/uts/common/fs/zfs/arc.c =================================================================== ---- zfsutils.orig/usr/src/uts/common/fs/zfs/arc.c 2012-10-08 00:25:51.000000000 +0000 -+++ zfsutils/usr/src/uts/common/fs/zfs/arc.c 2012-11-11 03:11:29.672292959 +0000 -@@ -1850,12 +1850,12 @@ - if (mru_over > 0 && arc_mru_ghost->arcs_lsize[type] > 0) { - int64_t todelete = - MIN(arc_mru_ghost->arcs_lsize[type], mru_over); -- arc_evict_ghost(arc_mru_ghost, NULL, todelete); -+ arc_evict_ghost(arc_mru_ghost, 0, todelete); - } else if (arc_mfu_ghost->arcs_lsize[type] > 0) { - int64_t todelete = MIN(arc_mfu_ghost->arcs_lsize[type], - arc_mru_ghost->arcs_size + - arc_mfu_ghost->arcs_size - arc_c); -- arc_evict_ghost(arc_mfu_ghost, NULL, todelete); -+ arc_evict_ghost(arc_mfu_ghost, 0, todelete); - } - } - -@@ -1963,13 +1963,13 @@ +--- a/usr/src/uts/common/fs/zfs/arc.c 2014-03-10 12:36:53.851944262 +0400 ++++ b/usr/src/uts/common/fs/zfs/arc.c 2014-03-10 12:37:06.916723804 +0400 +@@ -2053,13 +2053,13 @@ if (adjustment > 0 && arc_mru->arcs_lsize[ARC_BUFC_DATA] > 0) { delta = MIN(arc_mru->arcs_lsize[ARC_BUFC_DATA], adjustment); @@ -33,7 +18,7 @@ Index: zfsutils/usr/src/uts/common/fs/zfs/arc.c ARC_BUFC_METADATA); } -@@ -1981,14 +1981,14 @@ +@@ -2071,14 +2071,14 @@ if (adjustment > 0 && arc_mfu->arcs_lsize[ARC_BUFC_DATA] > 0) { delta = MIN(adjustment, arc_mfu->arcs_lsize[ARC_BUFC_DATA]); @@ -50,7 +35,7 @@ Index: zfsutils/usr/src/uts/common/fs/zfs/arc.c ARC_BUFC_METADATA); } -@@ -2000,7 +2000,7 @@ +@@ -2090,7 +2090,7 @@ if (adjustment > 0 && arc_mru_ghost->arcs_size > 0) { delta = MIN(arc_mru_ghost->arcs_size, adjustment); @@ -59,7 +44,7 @@ Index: zfsutils/usr/src/uts/common/fs/zfs/arc.c } adjustment = -@@ -2008,7 +2008,7 @@ +@@ -2098,7 +2098,7 @@ if (adjustment > 0 && arc_mfu_ghost->arcs_size > 0) { delta = MIN(arc_mfu_ghost->arcs_size, adjustment); @@ -68,7 +53,7 @@ Index: zfsutils/usr/src/uts/common/fs/zfs/arc.c } } -@@ -2441,7 +2441,7 @@ +@@ -2541,7 +2541,7 @@ state = (arc_mru->arcs_lsize[type] >= size && mfu_space > arc_mfu->arcs_size) ? arc_mru : arc_mfu; } diff --git a/zfsutils/debian/patches/libzpool-avoid-libcmdutil.patch b/zfsutils/debian/patches/libzpool-avoid-libcmdutil.patch index 33b6a9b..98e250b 100644 --- a/zfsutils/debian/patches/libzpool-avoid-libcmdutil.patch +++ b/zfsutils/debian/patches/libzpool-avoid-libcmdutil.patch @@ -1,16 +1,16 @@ -Index: zfsutils/usr/src/lib/libzpool/Makefile.com +Index: b/usr/src/lib/libzpool/Makefile.com =================================================================== ---- zfsutils.orig/usr/src/lib/libzpool/Makefile.com 2012-10-08 00:25:42.000000000 +0000 -+++ zfsutils/usr/src/lib/libzpool/Makefile.com 2012-11-11 19:09:36.528791522 +0000 -@@ -31,6 +31,7 @@ - KERNEL_OBJS = kernel.o taskq.o util.o +--- a/usr/src/lib/libzpool/Makefile.com 2014-03-10 12:36:47.976201413 +0400 ++++ b/usr/src/lib/libzpool/Makefile.com 2014-03-10 12:37:22.093549907 +0400 +@@ -32,6 +32,7 @@ + DTRACE_OBJS = zfs.o OBJECTS=$(ZFS_COMMON_OBJS) $(ZFS_SHARED_OBJS) $(KERNEL_OBJS) +OBJECTS += list.o # include library definitions include ../../Makefile.lib -@@ -59,7 +60,7 @@ +@@ -64,7 +65,7 @@ CFLAGS += -g $(CCVERBOSE) $(CNOGLOBAL) CFLAGS64 += -g $(CCVERBOSE) $(CNOGLOBAL) @@ -19,7 +19,7 @@ Index: zfsutils/usr/src/lib/libzpool/Makefile.com CPPFLAGS += $(INCS) -DDEBUG CERRWARN += -_gcc=-Wno-parentheses -@@ -83,6 +84,10 @@ +@@ -90,6 +91,10 @@ $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) @@ -27,6 +27,6 @@ Index: zfsutils/usr/src/lib/libzpool/Makefile.com + $(COMPILE.c) -o $@ $< + $(POST_PROCESS_O) + - pics/%.o: ../../../common/zfs/%.c + pics/%.o: ../../../common/zfs/%.c ../common/zfs.h $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) diff --git a/zfsutils/debian/patches/libzpool-libsunavl.patch b/zfsutils/debian/patches/libzpool-libsunavl.patch index b97daab..7ada92d 100644 --- a/zfsutils/debian/patches/libzpool-libsunavl.patch +++ b/zfsutils/debian/patches/libzpool-libsunavl.patch @@ -1,7 +1,7 @@ -Index: zfsutils/usr/src/uts/common/fs/zfs/ddt.c +Index: b/usr/src/uts/common/fs/zfs/ddt.c =================================================================== ---- zfsutils.orig/usr/src/uts/common/fs/zfs/ddt.c 2012-10-08 00:25:51.000000000 +0000 -+++ zfsutils/usr/src/uts/common/fs/zfs/ddt.c 2013-04-07 20:54:38.069358727 +0000 +--- a/usr/src/uts/common/fs/zfs/ddt.c 2014-03-10 12:36:38.344683162 +0400 ++++ b/usr/src/uts/common/fs/zfs/ddt.c 2014-03-10 12:37:57.398849299 +0400 @@ -37,6 +37,10 @@ #include <sys/zio_compress.h> #include <sys/dsl_scan.h> @@ -13,13 +13,13 @@ Index: zfsutils/usr/src/uts/common/fs/zfs/ddt.c /* * Enable/disable prefetching of dedup-ed blocks which are going to be freed. */ -Index: zfsutils/usr/src/uts/common/fs/zfs/dmu_send.c +Index: b/usr/src/uts/common/fs/zfs/dmu_send.c =================================================================== ---- zfsutils.orig/usr/src/uts/common/fs/zfs/dmu_send.c 2012-10-08 00:25:51.000000000 +0000 -+++ zfsutils/usr/src/uts/common/fs/zfs/dmu_send.c 2013-04-07 20:55:42.055006910 +0000 -@@ -47,6 +47,10 @@ - #include <sys/ddt.h> - #include <sys/zfs_onexit.h> +--- a/usr/src/uts/common/fs/zfs/dmu_send.c 2014-03-10 12:36:38.344551375 +0400 ++++ b/usr/src/uts/common/fs/zfs/dmu_send.c 2014-03-10 12:37:57.403207401 +0400 +@@ -50,6 +50,10 @@ + #include <sys/dsl_destroy.h> + #include <sys/dsl_bookmark.h> +#ifndef _KERNEL +#include <libsunavl.h> @@ -28,10 +28,10 @@ Index: zfsutils/usr/src/uts/common/fs/zfs/dmu_send.c /* Set this tunable to TRUE to replace corrupt data with 0x2f5baddb10c */ int zfs_send_corrupt_data = B_FALSE; -Index: zfsutils/usr/src/uts/common/fs/zfs/dnode.c +Index: b/usr/src/uts/common/fs/zfs/dnode.c =================================================================== ---- zfsutils.orig/usr/src/uts/common/fs/zfs/dnode.c 2012-10-08 00:25:51.000000000 +0000 -+++ zfsutils/usr/src/uts/common/fs/zfs/dnode.c 2013-04-07 20:56:16.648895151 +0000 +--- a/usr/src/uts/common/fs/zfs/dnode.c 2014-03-10 12:36:38.344840160 +0400 ++++ b/usr/src/uts/common/fs/zfs/dnode.c 2014-03-10 12:37:57.405623161 +0400 @@ -36,6 +36,10 @@ #include <sys/zio.h> #include <sys/dmu_zfetch.h> @@ -43,13 +43,13 @@ Index: zfsutils/usr/src/uts/common/fs/zfs/dnode.c static int free_range_compar(const void *node1, const void *node2); static kmem_cache_t *dnode_cache; -Index: zfsutils/usr/src/uts/common/fs/zfs/dnode_sync.c +Index: b/usr/src/uts/common/fs/zfs/dnode_sync.c =================================================================== ---- zfsutils.orig/usr/src/uts/common/fs/zfs/dnode_sync.c 2012-10-08 00:25:51.000000000 +0000 -+++ zfsutils/usr/src/uts/common/fs/zfs/dnode_sync.c 2013-04-07 20:56:40.715865891 +0000 -@@ -33,6 +33,10 @@ - #include <sys/dsl_dataset.h> +--- a/usr/src/uts/common/fs/zfs/dnode_sync.c 2014-03-10 12:36:38.344634790 +0400 ++++ b/usr/src/uts/common/fs/zfs/dnode_sync.c 2014-03-10 12:37:57.407237718 +0400 +@@ -34,6 +34,10 @@ #include <sys/spa.h> + #include <sys/zfeature.h> +#ifndef _KERNEL +#include <libsunavl.h> @@ -58,10 +58,10 @@ Index: zfsutils/usr/src/uts/common/fs/zfs/dnode_sync.c static void dnode_increase_indirection(dnode_t *dn, dmu_tx_t *tx) { -Index: zfsutils/usr/src/uts/common/fs/zfs/dsl_deadlist.c +Index: b/usr/src/uts/common/fs/zfs/dsl_deadlist.c =================================================================== ---- zfsutils.orig/usr/src/uts/common/fs/zfs/dsl_deadlist.c 2012-10-08 00:25:51.000000000 +0000 -+++ zfsutils/usr/src/uts/common/fs/zfs/dsl_deadlist.c 2013-04-07 20:57:12.612060190 +0000 +--- a/usr/src/uts/common/fs/zfs/dsl_deadlist.c 2014-03-10 12:36:38.344705465 +0400 ++++ b/usr/src/uts/common/fs/zfs/dsl_deadlist.c 2014-03-10 12:37:57.408611292 +0400 @@ -30,6 +30,10 @@ #include <sys/zfs_context.h> #include <sys/dsl_pool.h> @@ -73,10 +73,10 @@ Index: zfsutils/usr/src/uts/common/fs/zfs/dsl_deadlist.c /* * Deadlist concurrency: * -Index: zfsutils/usr/src/uts/common/fs/zfs/dsl_deleg.c +Index: b/usr/src/uts/common/fs/zfs/dsl_deleg.c =================================================================== ---- zfsutils.orig/usr/src/uts/common/fs/zfs/dsl_deleg.c 2012-10-08 00:25:51.000000000 +0000 -+++ zfsutils/usr/src/uts/common/fs/zfs/dsl_deleg.c 2013-04-07 20:57:36.791760125 +0000 +--- a/usr/src/uts/common/fs/zfs/dsl_deleg.c 2014-03-10 12:36:38.344492679 +0400 ++++ b/usr/src/uts/common/fs/zfs/dsl_deleg.c 2014-03-10 12:37:57.410124981 +0400 @@ -80,6 +80,10 @@ #include <sys/cred.h> #include <sys/sunddi.h> @@ -88,10 +88,10 @@ Index: zfsutils/usr/src/uts/common/fs/zfs/dsl_deleg.c #include "zfs_deleg.h" /* -Index: zfsutils/usr/src/uts/common/fs/zfs/dsl_scan.c +Index: b/usr/src/uts/common/fs/zfs/dsl_scan.c =================================================================== ---- zfsutils.orig/usr/src/uts/common/fs/zfs/dsl_scan.c 2012-10-08 00:25:51.000000000 +0000 -+++ zfsutils/usr/src/uts/common/fs/zfs/dsl_scan.c 2013-04-07 20:58:06.190612861 +0000 +--- a/usr/src/uts/common/fs/zfs/dsl_scan.c 2014-03-10 12:36:38.344794632 +0400 ++++ b/usr/src/uts/common/fs/zfs/dsl_scan.c 2014-03-10 12:37:57.412111005 +0400 @@ -50,6 +50,10 @@ #include <sys/zfs_vfsops.h> #endif @@ -103,13 +103,13 @@ Index: zfsutils/usr/src/uts/common/fs/zfs/dsl_scan.c typedef int (scan_cb_t)(dsl_pool_t *, const blkptr_t *, const zbookmark_t *); static scan_cb_t dsl_scan_defrag_cb; -Index: zfsutils/usr/src/uts/common/fs/zfs/metaslab.c +Index: b/usr/src/uts/common/fs/zfs/metaslab.c =================================================================== ---- zfsutils.orig/usr/src/uts/common/fs/zfs/metaslab.c 2012-10-08 00:25:51.000000000 +0000 -+++ zfsutils/usr/src/uts/common/fs/zfs/metaslab.c 2013-04-07 20:58:34.012304861 +0000 -@@ -31,6 +31,10 @@ - #include <sys/vdev_impl.h> +--- a/usr/src/uts/common/fs/zfs/metaslab.c 2014-03-10 12:36:38.344817841 +0400 ++++ b/usr/src/uts/common/fs/zfs/metaslab.c 2014-03-10 12:37:57.414990055 +0400 +@@ -33,6 +33,10 @@ #include <sys/zio.h> + #include <sys/spa_impl.h> +#ifndef _KERNEL +#include <libsunavl.h> @@ -118,10 +118,10 @@ Index: zfsutils/usr/src/uts/common/fs/zfs/metaslab.c /* * Allow allocations to switch to gang blocks quickly. We do this to * avoid having to load lots of space_maps in a given txg. There are, -Index: zfsutils/usr/src/uts/common/fs/zfs/sa.c +Index: b/usr/src/uts/common/fs/zfs/sa.c =================================================================== ---- zfsutils.orig/usr/src/uts/common/fs/zfs/sa.c 2013-04-07 20:41:26.461637452 +0000 -+++ zfsutils/usr/src/uts/common/fs/zfs/sa.c 2013-04-07 20:59:14.027823289 +0000 +--- a/usr/src/uts/common/fs/zfs/sa.c 2014-03-10 12:37:11.259608190 +0400 ++++ b/usr/src/uts/common/fs/zfs/sa.c 2014-03-10 12:37:57.417078893 +0400 @@ -43,6 +43,10 @@ #include <sys/errno.h> #include <sys/zfs_context.h> @@ -133,11 +133,11 @@ Index: zfsutils/usr/src/uts/common/fs/zfs/sa.c /* * ZFS System attributes: * -Index: zfsutils/usr/src/uts/common/fs/zfs/spa.c +Index: b/usr/src/uts/common/fs/zfs/spa.c =================================================================== ---- zfsutils.orig/usr/src/uts/common/fs/zfs/spa.c 2012-10-08 00:25:51.000000000 +0000 -+++ zfsutils/usr/src/uts/common/fs/zfs/spa.c 2013-04-07 20:59:10.449331435 +0000 -@@ -73,6 +73,10 @@ +--- a/usr/src/uts/common/fs/zfs/spa.c 2014-03-10 12:36:38.344905483 +0400 ++++ b/usr/src/uts/common/fs/zfs/spa.c 2014-03-10 12:37:57.424122768 +0400 +@@ -76,6 +76,10 @@ #include <sys/zone.h> #endif /* _KERNEL */ @@ -148,11 +148,11 @@ Index: zfsutils/usr/src/uts/common/fs/zfs/spa.c #include "zfs_prop.h" #include "zfs_comutil.h" -Index: zfsutils/usr/src/uts/common/fs/zfs/spa_errlog.c +Index: b/usr/src/uts/common/fs/zfs/spa_errlog.c =================================================================== ---- zfsutils.orig/usr/src/uts/common/fs/zfs/spa_errlog.c 2012-10-08 00:25:51.000000000 +0000 -+++ zfsutils/usr/src/uts/common/fs/zfs/spa_errlog.c 2013-04-07 20:59:41.430682147 +0000 -@@ -53,6 +53,10 @@ +--- a/usr/src/uts/common/fs/zfs/spa_errlog.c 2014-03-10 12:36:38.344750576 +0400 ++++ b/usr/src/uts/common/fs/zfs/spa_errlog.c 2014-03-10 12:37:57.425919142 +0400 +@@ -54,6 +54,10 @@ #include <sys/zap.h> #include <sys/zio.h> @@ -163,11 +163,11 @@ Index: zfsutils/usr/src/uts/common/fs/zfs/spa_errlog.c /* * Convert a bookmark to a string. -Index: zfsutils/usr/src/uts/common/fs/zfs/spa_misc.c +Index: b/usr/src/uts/common/fs/zfs/spa_misc.c =================================================================== ---- zfsutils.orig/usr/src/uts/common/fs/zfs/spa_misc.c 2012-10-08 00:25:51.000000000 +0000 -+++ zfsutils/usr/src/uts/common/fs/zfs/spa_misc.c 2013-04-07 21:00:04.802352120 +0000 -@@ -47,6 +47,11 @@ +--- a/usr/src/uts/common/fs/zfs/spa_misc.c 2014-03-10 12:36:38.344883015 +0400 ++++ b/usr/src/uts/common/fs/zfs/spa_misc.c 2014-03-10 12:37:57.427996274 +0400 +@@ -48,6 +48,11 @@ #include <sys/metaslab_impl.h> #include <sys/arc.h> #include <sys/ddt.h> @@ -179,25 +179,25 @@ Index: zfsutils/usr/src/uts/common/fs/zfs/spa_misc.c #include "zfs_prop.h" #include "zfeature_common.h" -Index: zfsutils/usr/src/uts/common/fs/zfs/space_map.c +Index: b/usr/src/uts/common/fs/zfs/space_map.c =================================================================== ---- zfsutils.orig/usr/src/uts/common/fs/zfs/space_map.c 2012-10-08 00:25:51.000000000 +0000 -+++ zfsutils/usr/src/uts/common/fs/zfs/space_map.c 2013-04-07 21:00:34.252005262 +0000 -@@ -32,6 +32,10 @@ - #include <sys/zio.h> - #include <sys/space_map.h> +--- a/usr/src/uts/common/fs/zfs/space_map.c 2014-03-10 12:36:38.344928509 +0400 ++++ b/usr/src/uts/common/fs/zfs/space_map.c 2014-03-10 12:37:57.429397816 +0400 +@@ -37,6 +37,10 @@ + #include <sys/refcount.h> + #include <sys/zfeature.h> +#ifndef _KERNEL +#include <libsunavl.h> +#endif + /* - * Space map routines. - * NOTE: caller is responsible for all locking. -Index: zfsutils/usr/src/uts/common/fs/zfs/unique.c + * This value controls how the space map's block size is allowed to grow. + * If the value is set to the same size as SPACE_MAP_INITIAL_BLOCKSIZE then +Index: b/usr/src/uts/common/fs/zfs/unique.c =================================================================== ---- zfsutils.orig/usr/src/uts/common/fs/zfs/unique.c 2012-10-08 00:25:51.000000000 +0000 -+++ zfsutils/usr/src/uts/common/fs/zfs/unique.c 2013-04-07 21:00:59.699640951 +0000 +--- a/usr/src/uts/common/fs/zfs/unique.c 2014-03-10 12:36:38.344727972 +0400 ++++ b/usr/src/uts/common/fs/zfs/unique.c 2014-03-10 12:37:57.430662695 +0400 @@ -29,6 +29,10 @@ #include <sys/avl.h> #include <sys/unique.h> @@ -209,11 +209,11 @@ Index: zfsutils/usr/src/uts/common/fs/zfs/unique.c static avl_tree_t unique_avl; static kmutex_t unique_mtx; -Index: zfsutils/usr/src/uts/common/fs/zfs/vdev.c +Index: b/usr/src/uts/common/fs/zfs/vdev.c =================================================================== ---- zfsutils.orig/usr/src/uts/common/fs/zfs/vdev.c 2013-04-07 20:41:26.648270769 +0000 -+++ zfsutils/usr/src/uts/common/fs/zfs/vdev.c 2013-04-07 21:01:20.981572643 +0000 -@@ -43,6 +43,10 @@ +--- a/usr/src/uts/common/fs/zfs/vdev.c 2014-03-10 12:37:13.482272874 +0400 ++++ b/usr/src/uts/common/fs/zfs/vdev.c 2014-03-10 12:37:57.433709367 +0400 +@@ -44,6 +44,10 @@ #include <sys/zil.h> #include <sys/dsl_scan.h> @@ -224,11 +224,11 @@ Index: zfsutils/usr/src/uts/common/fs/zfs/vdev.c /* * Virtual device management. */ -Index: zfsutils/usr/src/uts/common/fs/zfs/vdev_cache.c +Index: b/usr/src/uts/common/fs/zfs/vdev_cache.c =================================================================== ---- zfsutils.orig/usr/src/uts/common/fs/zfs/vdev_cache.c 2012-10-08 00:25:51.000000000 +0000 -+++ zfsutils/usr/src/uts/common/fs/zfs/vdev_cache.c 2013-04-07 21:01:44.211862241 +0000 -@@ -29,6 +29,10 @@ +--- a/usr/src/uts/common/fs/zfs/vdev_cache.c 2014-03-10 12:36:38.344382448 +0400 ++++ b/usr/src/uts/common/fs/zfs/vdev_cache.c 2014-03-10 12:37:57.435239415 +0400 +@@ -32,6 +32,10 @@ #include <sys/zio.h> #include <sys/kstat.h> @@ -239,25 +239,25 @@ Index: zfsutils/usr/src/uts/common/fs/zfs/vdev_cache.c /* * Virtual device read-ahead caching. * -Index: zfsutils/usr/src/uts/common/fs/zfs/vdev_queue.c +Index: b/usr/src/uts/common/fs/zfs/vdev_queue.c =================================================================== ---- zfsutils.orig/usr/src/uts/common/fs/zfs/vdev_queue.c 2012-10-08 00:25:51.000000000 +0000 -+++ zfsutils/usr/src/uts/common/fs/zfs/vdev_queue.c 2013-04-07 21:02:07.495832289 +0000 -@@ -28,6 +28,10 @@ - #include <sys/zio.h> - #include <sys/avl.h> +--- a/usr/src/uts/common/fs/zfs/vdev_queue.c 2014-03-10 12:36:38.344468757 +0400 ++++ b/usr/src/uts/common/fs/zfs/vdev_queue.c 2014-03-10 12:37:57.436776165 +0400 +@@ -23,6 +23,10 @@ + * Use is subject to license terms. + */ +#ifndef _KERNEL +#include <libsunavl.h> +#endif + /* - * These tunables are for performance analysis. + * Copyright (c) 2013 by Delphix. All rights reserved. */ -Index: zfsutils/usr/src/uts/common/fs/zfs/zap_micro.c +Index: b/usr/src/uts/common/fs/zfs/zap_micro.c =================================================================== ---- zfsutils.orig/usr/src/uts/common/fs/zfs/zap_micro.c 2012-10-08 00:25:51.000000000 +0000 -+++ zfsutils/usr/src/uts/common/fs/zfs/zap_micro.c 2013-04-07 21:02:37.062624276 +0000 +--- a/usr/src/uts/common/fs/zfs/zap_micro.c 2014-03-10 12:36:38.344861867 +0400 ++++ b/usr/src/uts/common/fs/zfs/zap_micro.c 2014-03-10 12:37:57.438627674 +0400 @@ -38,6 +38,10 @@ #include <sys/sunddi.h> #endif @@ -269,10 +269,10 @@ Index: zfsutils/usr/src/uts/common/fs/zfs/zap_micro.c static int mzap_upgrade(zap_t **zapp, dmu_tx_t *tx, zap_flags_t flags); uint64_t -Index: zfsutils/usr/src/uts/common/fs/zfs/zfs_fuid.c +Index: b/usr/src/uts/common/fs/zfs/zfs_fuid.c =================================================================== ---- zfsutils.orig/usr/src/uts/common/fs/zfs/zfs_fuid.c 2012-10-08 00:25:51.000000000 +0000 -+++ zfsutils/usr/src/uts/common/fs/zfs/zfs_fuid.c 2013-04-07 21:03:03.452189632 +0000 +--- a/usr/src/uts/common/fs/zfs/zfs_fuid.c 2014-03-10 12:36:38.344660174 +0400 ++++ b/usr/src/uts/common/fs/zfs/zfs_fuid.c 2014-03-10 12:37:57.440269798 +0400 @@ -36,6 +36,10 @@ #endif #include <sys/zfs_fuid.h> @@ -284,10 +284,10 @@ Index: zfsutils/usr/src/uts/common/fs/zfs/zfs_fuid.c /* * FUID Domain table(s). * -Index: zfsutils/usr/src/uts/common/fs/zfs/zil.c +Index: b/usr/src/uts/common/fs/zfs/zil.c =================================================================== ---- zfsutils.orig/usr/src/uts/common/fs/zfs/zil.c 2013-04-07 20:41:26.831620117 +0000 -+++ zfsutils/usr/src/uts/common/fs/zfs/zil.c 2013-04-07 21:03:26.424243787 +0000 +--- a/usr/src/uts/common/fs/zfs/zil.c 2014-03-10 12:37:15.693154121 +0400 ++++ b/usr/src/uts/common/fs/zfs/zil.c 2014-03-10 12:37:57.442432564 +0400 @@ -39,6 +39,10 @@ #include <sys/dmu_tx.h> #include <sys/dsl_pool.h> @@ -299,11 +299,11 @@ Index: zfsutils/usr/src/uts/common/fs/zfs/zil.c /* * The zfs intent log (ZIL) saves transaction records of system calls * that change the file system in memory with enough information -Index: zfsutils/usr/src/lib/libzpool/Makefile.com +Index: b/usr/src/lib/libzpool/Makefile.com =================================================================== ---- zfsutils.orig/usr/src/lib/libzpool/Makefile.com 2013-04-07 20:41:27.382997925 +0000 -+++ zfsutils/usr/src/lib/libzpool/Makefile.com 2013-04-07 21:04:05.546627744 +0000 -@@ -60,7 +60,7 @@ +--- a/usr/src/lib/libzpool/Makefile.com 2014-03-10 12:37:22.093549907 +0400 ++++ b/usr/src/lib/libzpool/Makefile.com 2014-03-10 12:37:57.443833162 +0400 +@@ -65,7 +65,7 @@ CFLAGS += -g $(CCVERBOSE) $(CNOGLOBAL) CFLAGS64 += -g $(CCVERBOSE) $(CNOGLOBAL) diff --git a/zfsutils/debian/patches/libzpool-no-sys-compress.h.patch b/zfsutils/debian/patches/libzpool-no-sys-compress.h.patch index b1e9a99..d4fb893 100644 --- a/zfsutils/debian/patches/libzpool-no-sys-compress.h.patch +++ b/zfsutils/debian/patches/libzpool-no-sys-compress.h.patch @@ -1,8 +1,8 @@ -Index: zfsutils/usr/src/uts/common/fs/zfs/zio_compress.c +Index: b/usr/src/uts/common/fs/zfs/zio_compress.c =================================================================== ---- zfsutils.orig/usr/src/uts/common/fs/zfs/zio_compress.c 2012-10-08 00:25:51.000000000 +0000 -+++ zfsutils/usr/src/uts/common/fs/zfs/zio_compress.c 2012-11-11 03:32:19.561960919 +0000 -@@ -25,7 +25,6 @@ +--- a/usr/src/uts/common/fs/zfs/zio_compress.c 2014-03-10 12:36:49.635985670 +0400 ++++ b/usr/src/uts/common/fs/zfs/zio_compress.c 2014-03-10 12:37:17.797466050 +0400 +@@ -32,7 +32,6 @@ */ #include <sys/zfs_context.h> diff --git a/zfsutils/debian/patches/libzpool-no-util-sscanf.h.patch b/zfsutils/debian/patches/libzpool-no-util-sscanf.h.patch index 6e80d9b..8fe3a90 100644 --- a/zfsutils/debian/patches/libzpool-no-util-sscanf.h.patch +++ b/zfsutils/debian/patches/libzpool-no-util-sscanf.h.patch @@ -1,7 +1,7 @@ -Index: zfsutils/usr/src/uts/common/fs/zfs/ddt_zap.c +Index: b/usr/src/uts/common/fs/zfs/ddt_zap.c =================================================================== ---- zfsutils.orig/usr/src/uts/common/fs/zfs/ddt_zap.c 2012-10-08 00:25:51.000000000 +0000 -+++ zfsutils/usr/src/uts/common/fs/zfs/ddt_zap.c 2012-11-11 03:16:12.273170447 +0000 +--- a/usr/src/uts/common/fs/zfs/ddt_zap.c 2014-03-10 12:36:53.331819349 +0400 ++++ b/usr/src/uts/common/fs/zfs/ddt_zap.c 2014-03-10 12:37:09.150588131 +0400 @@ -29,7 +29,6 @@ #include <sys/ddt.h> #include <sys/zap.h> diff --git a/zfsutils/debian/patches/libzpool-sa.c-NULL-0.patch b/zfsutils/debian/patches/libzpool-sa.c-NULL-0.patch index 7673d11..dd39ccb 100644 --- a/zfsutils/debian/patches/libzpool-sa.c-NULL-0.patch +++ b/zfsutils/debian/patches/libzpool-sa.c-NULL-0.patch @@ -1,8 +1,8 @@ -Index: zfsutils/usr/src/uts/common/fs/zfs/sa.c +Index: b/usr/src/uts/common/fs/zfs/sa.c =================================================================== ---- zfsutils.orig/usr/src/uts/common/fs/zfs/sa.c 2012-10-08 00:25:51.000000000 +0000 -+++ zfsutils/usr/src/uts/common/fs/zfs/sa.c 2012-11-11 03:18:02.084228386 +0000 -@@ -1547,12 +1547,12 @@ +--- a/usr/src/uts/common/fs/zfs/sa.c 2014-03-10 12:36:52.784229247 +0400 ++++ b/usr/src/uts/common/fs/zfs/sa.c 2014-03-10 12:37:11.259608190 +0400 +@@ -1568,12 +1568,12 @@ mutex_enter(&sa->sa_lock); diff --git a/zfsutils/debian/patches/libzpool-vdev.c-NULL-0.patch b/zfsutils/debian/patches/libzpool-vdev.c-NULL-0.patch index 6f4bd88..5a6233a 100644 --- a/zfsutils/debian/patches/libzpool-vdev.c-NULL-0.patch +++ b/zfsutils/debian/patches/libzpool-vdev.c-NULL-0.patch @@ -1,8 +1,8 @@ -Index: zfsutils/usr/src/uts/common/fs/zfs/vdev.c +Index: b/usr/src/uts/common/fs/zfs/vdev.c =================================================================== ---- zfsutils.orig/usr/src/uts/common/fs/zfs/vdev.c 2012-10-08 00:25:51.000000000 +0000 -+++ zfsutils/usr/src/uts/common/fs/zfs/vdev.c 2012-11-11 03:25:41.707898802 +0000 -@@ -1095,7 +1095,7 @@ +--- a/usr/src/uts/common/fs/zfs/vdev.c 2014-03-10 12:36:51.695959906 +0400 ++++ b/usr/src/uts/common/fs/zfs/vdev.c 2014-03-10 12:37:13.482272874 +0400 +@@ -1091,7 +1091,7 @@ for (int c = 0; c < children; c++) VERIFY(taskq_dispatch(tq, vdev_open_child, vd->vdev_child[c], diff --git a/zfsutils/debian/patches/libzpool-zil.c-NULL-0.patch b/zfsutils/debian/patches/libzpool-zil.c-NULL-0.patch index e05eb2a..29326fd 100644 --- a/zfsutils/debian/patches/libzpool-zil.c-NULL-0.patch +++ b/zfsutils/debian/patches/libzpool-zil.c-NULL-0.patch @@ -1,8 +1,8 @@ -Index: zfsutils/usr/src/uts/common/fs/zfs/zil.c +Index: b/usr/src/uts/common/fs/zfs/zil.c =================================================================== ---- zfsutils.orig/usr/src/uts/common/fs/zfs/zil.c 2012-10-08 00:25:51.000000000 +0000 -+++ zfsutils/usr/src/uts/common/fs/zfs/zil.c 2012-11-11 03:28:22.977886705 +0000 -@@ -1344,7 +1344,7 @@ +--- a/usr/src/uts/common/fs/zfs/zil.c 2014-03-10 12:36:50.700601946 +0400 ++++ b/usr/src/uts/common/fs/zfs/zil.c 2014-03-10 12:37:15.693154121 +0400 +@@ -1347,7 +1347,7 @@ * created a bad performance problem. */ if (taskq_dispatch(zilog->zl_clean_taskq, diff --git a/zfsutils/debian/patches/series b/zfsutils/debian/patches/series index d21f8a0..788bb8d 100644 --- a/zfsutils/debian/patches/series +++ b/zfsutils/debian/patches/series @@ -26,3 +26,6 @@ libzfs-libshare-can-be-missed.patch libzfs-libsunavl.patch libzpool-libsunavl.patch zdb-libsunavl.patch +uts-zfs-NULL-0.patch +uts-zfs-libsunavl.patch +zlib-multiarch.patch diff --git a/zfsutils/debian/patches/uts-zfs-NULL-0.patch b/zfsutils/debian/patches/uts-zfs-NULL-0.patch new file mode 100644 index 0000000..0c711b8 --- /dev/null +++ b/zfsutils/debian/patches/uts-zfs-NULL-0.patch @@ -0,0 +1,26 @@ +Index: zfsutils/usr/src/uts/common/fs/zfs/dsl_pool.c +=================================================================== +--- zfsutils.orig/usr/src/uts/common/fs/zfs/dsl_pool.c 2014-03-01 16:18:28.000000000 +0400 ++++ zfsutils/usr/src/uts/common/fs/zfs/dsl_pool.c 2014-03-10 12:49:22.622217562 +0400 +@@ -938,7 +938,7 @@ + dsl_pool_user_release(dsl_pool_t *dp, uint64_t dsobj, const char *tag, + dmu_tx_t *tx) + { +- return (dsl_pool_user_hold_rele_impl(dp, dsobj, tag, NULL, ++ return (dsl_pool_user_hold_rele_impl(dp, dsobj, tag, 0, + tx, B_FALSE)); + } + +Index: zfsutils/usr/src/uts/common/fs/zfs/metaslab.c +=================================================================== +--- zfsutils.orig/usr/src/uts/common/fs/zfs/metaslab.c 2014-03-10 12:37:57.414990055 +0400 ++++ zfsutils/usr/src/uts/common/fs/zfs/metaslab.c 2014-03-10 12:51:03.955605619 +0400 +@@ -1254,7 +1254,7 @@ + break; + + VERIFY(taskq_dispatch(mg->mg_taskq, metaslab_preload, +- msp, TQ_SLEEP) != NULL); ++ msp, TQ_SLEEP) != 0); + } + mutex_exit(&mg->mg_lock); + } diff --git a/zfsutils/debian/patches/uts-zfs-libsunavl.patch b/zfsutils/debian/patches/uts-zfs-libsunavl.patch new file mode 100644 index 0000000..e6b319a --- /dev/null +++ b/zfsutils/debian/patches/uts-zfs-libsunavl.patch @@ -0,0 +1,24 @@ +Index: zfsutils/usr/src/uts/common/fs/zfs/range_tree.c +=================================================================== +--- zfsutils.orig/usr/src/uts/common/fs/zfs/range_tree.c 2014-03-01 16:18:28.000000000 +0400 ++++ zfsutils/usr/src/uts/common/fs/zfs/range_tree.c 2014-03-10 13:04:38.525526652 +0400 +@@ -32,6 +32,7 @@ + #include <sys/dnode.h> + #include <sys/zio.h> + #include <sys/range_tree.h> ++#include <libsunavl.h> + + static kmem_cache_t *range_seg_cache; + +Index: zfsutils/usr/src/uts/common/fs/zfs/space_reftree.c +=================================================================== +--- zfsutils.orig/usr/src/uts/common/fs/zfs/space_reftree.c 2014-03-01 16:18:28.000000000 +0400 ++++ zfsutils/usr/src/uts/common/fs/zfs/space_reftree.c 2014-03-10 13:07:30.418825325 +0400 +@@ -29,6 +29,7 @@ + #include <sys/zfs_context.h> + #include <sys/range_tree.h> + #include <sys/space_reftree.h> ++#include <libsunavl.h> + + /* + * Space reference trees. diff --git a/zfsutils/debian/patches/zdb-build.patch b/zfsutils/debian/patches/zdb-build.patch index 3a2e707..7ea384d 100644 --- a/zfsutils/debian/patches/zdb-build.patch +++ b/zfsutils/debian/patches/zdb-build.patch @@ -1,7 +1,7 @@ -Index: zfsutils/usr/src/cmd/zdb/Makefile +Index: b/usr/src/cmd/zdb/Makefile =================================================================== ---- zfsutils.orig/usr/src/cmd/zdb/Makefile 2012-10-08 00:25:34.000000000 +0000 -+++ zfsutils/usr/src/cmd/zdb/Makefile 2012-11-12 11:55:47.899854638 +0000 +--- a/usr/src/cmd/zdb/Makefile 2014-03-10 12:36:43.164430610 +0400 ++++ b/usr/src/cmd/zdb/Makefile 2014-03-10 12:37:38.212871742 +0400 @@ -26,12 +26,11 @@ # ident "%Z%%M% %I% %E% SMI" # @@ -29,10 +29,10 @@ Index: zfsutils/usr/src/cmd/zdb/Makefile $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) -Index: zfsutils/usr/src/cmd/zdb/Makefile.com +Index: b/usr/src/cmd/zdb/Makefile.com =================================================================== ---- zfsutils.orig/usr/src/cmd/zdb/Makefile.com 2012-10-08 00:25:34.000000000 +0000 -+++ zfsutils/usr/src/cmd/zdb/Makefile.com 2012-11-12 11:56:08.078364086 +0000 +--- a/usr/src/cmd/zdb/Makefile.com 2014-03-10 12:36:43.164274996 +0400 ++++ b/usr/src/cmd/zdb/Makefile.com 2014-03-10 12:37:38.214370000 +0400 @@ -25,7 +25,7 @@ # Copyright (c) 2012 by Delphix. All rights reserved. # @@ -42,10 +42,10 @@ Index: zfsutils/usr/src/cmd/zdb/Makefile.com SRCS= ../$(PROG).c ../zdb_il.c OBJS= $(PROG).o zdb_il.o -Index: zfsutils/usr/src/cmd/zdb/i386/Makefile +Index: b/usr/src/cmd/zdb/i386/Makefile =================================================================== ---- zfsutils.orig/usr/src/cmd/zdb/i386/Makefile 2012-10-08 00:25:34.000000000 +0000 -+++ zfsutils/usr/src/cmd/zdb/i386/Makefile 2012-11-12 11:56:17.086398046 +0000 +--- a/usr/src/cmd/zdb/i386/Makefile 2014-03-10 12:36:43.164494409 +0400 ++++ b/usr/src/cmd/zdb/i386/Makefile 2014-03-10 12:37:38.215827549 +0400 @@ -28,4 +28,4 @@ include ../Makefile.com diff --git a/zfsutils/debian/patches/zdb-libsunavl.patch b/zfsutils/debian/patches/zdb-libsunavl.patch index 5137250..367eea8 100644 --- a/zfsutils/debian/patches/zdb-libsunavl.patch +++ b/zfsutils/debian/patches/zdb-libsunavl.patch @@ -1,7 +1,7 @@ -Index: zfsutils/usr/src/cmd/zdb/Makefile.com +Index: b/usr/src/cmd/zdb/Makefile.com =================================================================== ---- zfsutils.orig/usr/src/cmd/zdb/Makefile.com 2013-04-07 20:41:28.694281438 +0000 -+++ zfsutils/usr/src/cmd/zdb/Makefile.com 2013-04-07 21:06:56.633509508 +0000 +--- a/usr/src/cmd/zdb/Makefile.com 2014-03-10 12:37:38.214370000 +0400 ++++ b/usr/src/cmd/zdb/Makefile.com 2014-03-10 12:38:03.714698593 +0400 @@ -36,7 +36,7 @@ INCS += -I../../../uts/common/fs/zfs INCS += -I../../../common/zfs @@ -11,15 +11,15 @@ Index: zfsutils/usr/src/cmd/zdb/Makefile.com C99MODE= -xc99=%all C99LMODE= -Xc99=%all -Index: zfsutils/usr/src/cmd/zdb/zdb.c +Index: b/usr/src/cmd/zdb/zdb.c =================================================================== ---- zfsutils.orig/usr/src/cmd/zdb/zdb.c 2012-10-08 00:25:34.000000000 +0000 -+++ zfsutils/usr/src/cmd/zdb/zdb.c 2013-04-07 21:06:46.484925627 +0000 -@@ -61,6 +61,7 @@ +--- a/usr/src/cmd/zdb/zdb.c 2014-03-10 12:36:37.783083080 +0400 ++++ b/usr/src/cmd/zdb/zdb.c 2014-03-10 12:38:03.719812714 +0400 +@@ -62,6 +62,7 @@ #undef ZFS_MAXNAMELEN #undef verify #include <libzfs.h> +#include <libsunavl.h> - #define ZDB_COMPRESS_NAME(idx) ((idx) < ZIO_COMPRESS_FUNCTIONS ? \ - zio_compress_table[(idx)].ci_name : "UNKNOWN") + #define ZDB_COMPRESS_NAME(idx) ((idx) < ZIO_COMPRESS_FUNCTIONS ? \ + zio_compress_table[(idx)].ci_name : "UNKNOWN") diff --git a/zfsutils/debian/patches/zfs-NULL-0.patch b/zfsutils/debian/patches/zfs-NULL-0.patch index 79c2195..49617f7 100644 --- a/zfsutils/debian/patches/zfs-NULL-0.patch +++ b/zfsutils/debian/patches/zfs-NULL-0.patch @@ -1,8 +1,8 @@ -Index: zfsutils/usr/src/cmd/zfs/zfs_main.c +Index: b/usr/src/cmd/zfs/zfs_main.c =================================================================== ---- zfsutils.orig/usr/src/cmd/zfs/zfs_main.c 2012-10-08 00:25:34.000000000 +0000 -+++ zfsutils/usr/src/cmd/zfs/zfs_main.c 2012-11-15 15:45:39.604542883 +0000 -@@ -3393,7 +3393,7 @@ +--- a/usr/src/cmd/zfs/zfs_main.c 2014-03-10 12:36:40.535079712 +0400 ++++ b/usr/src/cmd/zfs/zfs_main.c 2014-03-10 12:37:47.804042289 +0400 +@@ -3503,7 +3503,7 @@ usage(B_FALSE); } diff --git a/zfsutils/debian/patches/zfs-no-etc-links.patch b/zfsutils/debian/patches/zfs-no-etc-links.patch index cbb53f3..fb29780 100644 --- a/zfsutils/debian/patches/zfs-no-etc-links.patch +++ b/zfsutils/debian/patches/zfs-no-etc-links.patch @@ -1,7 +1,7 @@ -Index: zfsutils/usr/src/cmd/zfs/Makefile +Index: b/usr/src/cmd/zfs/Makefile =================================================================== ---- zfsutils.orig/usr/src/cmd/zfs/Makefile 2012-10-08 00:25:34.000000000 +0000 -+++ zfsutils/usr/src/cmd/zfs/Makefile 2012-11-15 15:49:53.988302464 +0000 +--- a/usr/src/cmd/zfs/Makefile 2014-03-10 12:36:40.013469109 +0400 ++++ b/usr/src/cmd/zfs/Makefile 2014-03-10 12:37:49.954809739 +0400 @@ -74,7 +74,6 @@ $(POST_PROCESS) diff --git a/zfsutils/debian/patches/zinject-build.patch b/zfsutils/debian/patches/zinject-build.patch index 9eb6955..36c9ce2 100644 --- a/zfsutils/debian/patches/zinject-build.patch +++ b/zfsutils/debian/patches/zinject-build.patch @@ -1,7 +1,7 @@ -Index: zfsutils/usr/src/cmd/zinject/Makefile +Index: b/usr/src/cmd/zinject/Makefile =================================================================== ---- zfsutils.orig/usr/src/cmd/zinject/Makefile 2012-10-08 00:25:34.000000000 +0000 -+++ zfsutils/usr/src/cmd/zinject/Makefile 2012-11-12 12:52:31.016255908 +0000 +--- a/usr/src/cmd/zinject/Makefile 2014-03-10 12:36:42.115179682 +0400 ++++ b/usr/src/cmd/zinject/Makefile 2014-03-10 12:37:40.702644861 +0400 @@ -25,12 +25,11 @@ # ident "%Z%%M% %I% %E% SMI" # @@ -29,10 +29,10 @@ Index: zfsutils/usr/src/cmd/zinject/Makefile $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) -Index: zfsutils/usr/src/cmd/zinject/Makefile.com +Index: b/usr/src/cmd/zinject/Makefile.com =================================================================== ---- zfsutils.orig/usr/src/cmd/zinject/Makefile.com 2012-10-08 00:25:34.000000000 +0000 -+++ zfsutils/usr/src/cmd/zinject/Makefile.com 2012-11-12 12:53:05.859804595 +0000 +--- a/usr/src/cmd/zinject/Makefile.com 2014-03-10 12:36:42.115240592 +0400 ++++ b/usr/src/cmd/zinject/Makefile.com 2014-03-10 12:37:40.704245095 +0400 @@ -23,7 +23,7 @@ # Use is subject to license terms. # @@ -42,10 +42,10 @@ Index: zfsutils/usr/src/cmd/zinject/Makefile.com OBJS= $(PROG).o translate.o SRCS= $(OBJS:%.o=../%.c) -Index: zfsutils/usr/src/cmd/zinject/i386/Makefile +Index: b/usr/src/cmd/zinject/i386/Makefile =================================================================== ---- zfsutils.orig/usr/src/cmd/zinject/i386/Makefile 2012-10-08 00:25:34.000000000 +0000 -+++ zfsutils/usr/src/cmd/zinject/i386/Makefile 2012-11-12 12:53:18.944382054 +0000 +--- a/usr/src/cmd/zinject/i386/Makefile 2014-03-10 12:36:42.115262800 +0400 ++++ b/usr/src/cmd/zinject/i386/Makefile 2014-03-10 12:37:40.705410980 +0400 @@ -27,4 +27,4 @@ include ../Makefile.com diff --git a/zfsutils/debian/patches/zlib-multiarch.patch b/zfsutils/debian/patches/zlib-multiarch.patch new file mode 100644 index 0000000..ab0d3fb --- /dev/null +++ b/zfsutils/debian/patches/zlib-multiarch.patch @@ -0,0 +1,12 @@ +Index: zfsutils/usr/src/lib/libzpool/Makefile.com +=================================================================== +--- zfsutils.orig/usr/src/lib/libzpool/Makefile.com 2014-03-10 12:37:57.443833162 +0400 ++++ zfsutils/usr/src/lib/libzpool/Makefile.com 2014-03-10 13:21:15.007397686 +0400 +@@ -53,6 +53,7 @@ + INCS += -I../../../uts/common/fs/zfs + INCS += -I../../../common/zfs + INCS += -I../../../common ++INCS += -I/usr/include/$(DEB_HOST_MULTIARCH) + + CLEANFILES += ../common/zfs.h + CLEANFILES += $(EXTPICS) diff --git a/zfsutils/debian/patches/zpool-time.patch b/zfsutils/debian/patches/zpool-time.patch index 95cce4d..d887ccc 100644 --- a/zfsutils/debian/patches/zpool-time.patch +++ b/zfsutils/debian/patches/zpool-time.patch @@ -1,7 +1,7 @@ -Index: zfsutils/usr/src/cmd/stat/common/timestamp.c +Index: b/usr/src/cmd/stat/common/timestamp.c =================================================================== ---- zfsutils.orig/usr/src/cmd/stat/common/timestamp.c 2012-10-08 00:25:33.000000000 +0000 -+++ zfsutils/usr/src/cmd/stat/common/timestamp.c 2012-11-12 11:04:29.221856294 +0000 +--- a/usr/src/cmd/stat/common/timestamp.c 2014-03-10 12:36:43.699045027 +0400 ++++ b/usr/src/cmd/stat/common/timestamp.c 2014-03-10 12:37:36.061367522 +0400 @@ -25,6 +25,7 @@ #include "statcommon.h" diff --git a/zfsutils/debian/patches/ztest-avoid-libcmdutils.patch b/zfsutils/debian/patches/ztest-avoid-libcmdutils.patch index 56f6735..b65d844 100644 --- a/zfsutils/debian/patches/ztest-avoid-libcmdutils.patch +++ b/zfsutils/debian/patches/ztest-avoid-libcmdutils.patch @@ -1,7 +1,7 @@ -Index: zfsutils/usr/src/cmd/ztest/Makefile.com +Index: b/usr/src/cmd/ztest/Makefile.com =================================================================== ---- zfsutils.orig/usr/src/cmd/ztest/Makefile.com 2012-10-08 00:25:34.000000000 +0000 -+++ zfsutils/usr/src/cmd/ztest/Makefile.com 2012-11-12 13:01:05.036574989 +0000 +--- a/usr/src/cmd/ztest/Makefile.com 2014-03-10 12:36:41.558531565 +0400 ++++ b/usr/src/cmd/ztest/Makefile.com 2014-03-10 12:37:43.197392701 +0400 @@ -34,7 +34,7 @@ INCS += -I../../../uts/common/fs/zfs INCS += -I../../../common/zfs diff --git a/zfsutils/debian/patches/ztest-build.patch b/zfsutils/debian/patches/ztest-build.patch index e2f3458..d6de3d9 100644 --- a/zfsutils/debian/patches/ztest-build.patch +++ b/zfsutils/debian/patches/ztest-build.patch @@ -1,7 +1,7 @@ -Index: zfsutils/usr/src/cmd/ztest/Makefile +Index: b/usr/src/cmd/ztest/Makefile =================================================================== ---- zfsutils.orig/usr/src/cmd/ztest/Makefile 2012-10-08 00:25:34.000000000 +0000 -+++ zfsutils/usr/src/cmd/ztest/Makefile 2012-11-12 13:04:49.274903600 +0000 +--- a/usr/src/cmd/ztest/Makefile 2014-03-10 12:36:41.038222129 +0400 ++++ b/usr/src/cmd/ztest/Makefile 2014-03-10 12:37:45.418515938 +0400 @@ -25,12 +25,11 @@ # ident "%Z%%M% %I% %E% SMI" # @@ -29,10 +29,10 @@ Index: zfsutils/usr/src/cmd/ztest/Makefile $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) -Index: zfsutils/usr/src/cmd/ztest/i386/Makefile +Index: b/usr/src/cmd/ztest/i386/Makefile =================================================================== ---- zfsutils.orig/usr/src/cmd/ztest/i386/Makefile 2012-10-08 00:25:34.000000000 +0000 -+++ zfsutils/usr/src/cmd/ztest/i386/Makefile 2012-11-12 13:04:17.983373096 +0000 +--- a/usr/src/cmd/ztest/i386/Makefile 2014-03-10 12:36:41.038278038 +0400 ++++ b/usr/src/cmd/ztest/i386/Makefile 2014-03-10 12:37:45.420306853 +0400 @@ -28,4 +28,4 @@ include ../Makefile.com diff --git a/zfsutils/debian/rules b/zfsutils/debian/rules index f724adf..1234768 100755 --- a/zfsutils/debian/rules +++ b/zfsutils/debian/rules @@ -138,5 +138,5 @@ clean: unpatch dh_testdir dh_testroot dh_clean - rm -rf usr + rm -rf usr .pc |