]> git.proxmox.com Git - mirror_zfs.git/commit
OpenZFS 2605, 6980, 6902
authorMatthew Ahrens <mahrens@delphix.com>
Wed, 6 Jan 2016 21:22:48 +0000 (22:22 +0100)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 28 Jun 2016 20:47:02 +0000 (13:47 -0700)
commit47dfff3b86c67c6ae184c2b7166eaa529590c2d2
treeea731650ffe4a016c08fb83d2a6f00e6bd6738d4
parent669cf0ab298dd66e512b37f6c4a42aee2d767b80
OpenZFS 2605, 6980, 6902

2605 want to resume interrupted zfs send
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Paul Dagnelie <pcd@delphix.com>
Reviewed by: Richard Elling <Richard.Elling@RichardElling.com>
Reviewed by: Xin Li <delphij@freebsd.org>
Reviewed by: Arne Jansen <sensille@gmx.net>
Approved by: Dan McDonald <danmcd@omniti.com>
Ported-by: kernelOfTruth <kerneloftruth@gmail.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
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 <pcd@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Ported by: Brian Behlendorf <behlendorf1@llnl.gov>

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.
40 files changed:
cmd/zfs/zfs_main.c
cmd/zstreamdump/zstreamdump.c
config/user-commands.m4
include/libzfs.h
include/libzfs_core.h
include/sys/dmu_impl.h
include/sys/dmu_send.h
include/sys/dmu_traverse.h
include/sys/dsl_dataset.h
include/sys/fs/zfs.h
include/sys/zfs_ioctl.h
include/sys/zvol.h
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_mount.c
lib/libzfs/libzfs_sendrecv.c
lib/libzfs_core/libzfs_core.c
lib/libzpool/kernel.c
man/man8/zfs.8
module/zcommon/zfs_prop.c
module/zfs/dmu_objset.c
module/zfs/dmu_send.c
module/zfs/dmu_traverse.c
module/zfs/dsl_dataset.c
module/zfs/dsl_destroy.c
module/zfs/zfs_ioctl.c
module/zfs/zvol.c
tests/runfiles/linux.run
tests/zfs-tests/cmd/mktree/mktree.c
tests/zfs-tests/include/commands.cfg.in
tests/zfs-tests/tests/functional/cli_root/zfs_receive/Makefile.am
tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_007_pos.ksh
tests/zfs-tests/tests/functional/rsend/rsend.kshlib
tests/zfs-tests/tests/functional/rsend/rsend_012_pos.ksh
tests/zfs-tests/tests/functional/rsend/rsend_014_pos.ksh [changed mode: 0644->0755]
tests/zfs-tests/tests/functional/rsend/rsend_019_pos.ksh [changed mode: 0644->0755]
tests/zfs-tests/tests/functional/rsend/rsend_020_pos.ksh [changed mode: 0644->0755]
tests/zfs-tests/tests/functional/rsend/rsend_021_pos.ksh [changed mode: 0644->0755]
tests/zfs-tests/tests/functional/rsend/rsend_022_pos.ksh [changed mode: 0644->0755]
tests/zfs-tests/tests/functional/rsend/rsend_024_pos.ksh [changed mode: 0644->0755]
zfs-script-config.sh.in