From 47dfff3b86c67c6ae184c2b7166eaa529590c2d2 Mon Sep 17 00:00:00 2001 From: Matthew Ahrens Date: Wed, 6 Jan 2016 22:22:48 +0100 Subject: OpenZFS 2605, 6980, 6902 2605 want to resume interrupted zfs send Reviewed by: George Wilson Reviewed by: Paul Dagnelie Reviewed by: Richard Elling Reviewed by: Xin Li Reviewed by: Arne Jansen Approved by: Dan McDonald Ported-by: kernelOfTruth Signed-off-by: Brian Behlendorf OpenZFS-issue: https://www.illumos.org/issues/2605 OpenZFS-commit: https://github.com/openzfs/openzfs/commit/9c3fd12 6980 6902 causes zfs send to break due to 32-bit/64-bit struct mismatch Reviewed by: Paul Dagnelie Reviewed by: George Wilson Approved by: Robert Mustacchi Ported by: Brian Behlendorf OpenZFS-issue: https://www.illumos.org/issues/6980 OpenZFS-commit: https://github.com/openzfs/openzfs/commit/ea4a67f Porting notes: - All rsend and snapshop tests enabled and updated for Linux. - Fix misuse of input argument in traverse_visitbp(). - Fix ISO C90 warnings and errors. - Fix gcc 'missing braces around initializer' in 'struct send_thread_arg to_arg =' warning. - Replace 4 argument fletcher_4_native() with 3 argument version, this change was made in OpenZFS 4185 which has not been ported. - Part of the sections for 'zfs receive' and 'zfs send' was rewritten and reordered to approximate upstream. - Fix mktree xattr creation, 'user.' prefix required. - Minor fixes to newly enabled test cases - Long holds for volumes allowed during receive for minor registration. --- config/user-commands.m4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config/user-commands.m4') diff --git a/config/user-commands.m4 b/config/user-commands.m4 index 655b99241..bda2b8652 100644 --- a/config/user-commands.m4 +++ b/config/user-commands.m4 @@ -67,6 +67,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_COMMANDS_COMMON], [ AC_PATH_TOOL(SHUF, shuf, "") AC_PATH_TOOL(SLEEP, sleep, "") AC_PATH_TOOL(SORT, sort, "") + AC_PATH_TOOL(STAT, stat, "") AC_PATH_TOOL(STRINGS, strings, "") AC_PATH_TOOL(SU, su, "") AC_PATH_TOOL(SUM, sum, "") @@ -75,6 +76,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_COMMANDS_COMMON], [ AC_PATH_TOOL(TAR, tar, "") AC_PATH_TOOL(TOUCH, touch, "") AC_PATH_TOOL(TR, tr, "") + AC_PATH_TOOL(TRUNCATE, truncate, "") AC_PATH_TOOL(TRUE, true, "") AC_PATH_TOOL(UMASK, umask, "") AC_PATH_TOOL(UMOUNT, umount, "") @@ -103,7 +105,6 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_COMMANDS_LINUX], [ AC_PATH_TOOL(SHARE, exportfs, "") AC_PATH_TOOL(SWAP, swapon, "") AC_PATH_TOOL(SWAPADD, swapon, "") - AC_PATH_TOOL(TRUNCATE, truncate, "") AC_PATH_TOOL(UDEVADM, udevadm, "") AC_PATH_TOOL(UFSDUMP, dump, "") AC_PATH_TOOL(UFSRESTORE, restore, "") -- cgit v1.2.3