diff options
| author | Matthew Ahrens <[email protected]> | 2016-01-06 22:22:48 +0100 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-06-28 13:47:02 -0700 |
| commit | 47dfff3b86c67c6ae184c2b7166eaa529590c2d2 (patch) | |
| tree | ea731650ffe4a016c08fb83d2a6f00e6bd6738d4 /zfs-script-config.sh.in | |
| parent | 669cf0ab298dd66e512b37f6c4a42aee2d767b80 (diff) | |
OpenZFS 2605, 6980, 6902
2605 want to resume interrupted zfs send
Reviewed by: George Wilson <[email protected]>
Reviewed by: Paul Dagnelie <[email protected]>
Reviewed by: Richard Elling <[email protected]>
Reviewed by: Xin Li <[email protected]>
Reviewed by: Arne Jansen <[email protected]>
Approved by: Dan McDonald <[email protected]>
Ported-by: kernelOfTruth <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
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 <[email protected]>
Reviewed by: George Wilson <[email protected]>
Approved by: Robert Mustacchi <[email protected]>
Ported by: Brian Behlendorf <[email protected]>
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.
Diffstat (limited to 'zfs-script-config.sh.in')
| -rw-r--r-- | zfs-script-config.sh.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/zfs-script-config.sh.in b/zfs-script-config.sh.in index e22cfd595..0a85c5fef 100644 --- a/zfs-script-config.sh.in +++ b/zfs-script-config.sh.in @@ -50,7 +50,7 @@ export FILE_WRITE=${TESTSDIR}/zfs-tests/cmd/file_write/file_write export LARGEST_FILE=${TESTSDIR}/zfs-tests/cmd/largest_file/largest_file export MKBUSY=${TESTSDIR}/zfs-tests/cmd/mkbusy/mkbusy export MKFILE=${TESTSDIR}/zfs-tests/cmd/mkfile/mkfile -export MKFILES=${TESTSDIR}/zfs-tests/cmd/mkfile/mkfiles +export MKFILES=${TESTSDIR}/zfs-tests/cmd/mkfiles/mkfiles export MKTREE=${TESTSDIR}/zfs-tests/cmd/mktree/mktree export MMAP_EXEC=${TESTSDIR}/zfs-tests/cmd/mmap_exec/mmap_exec export MMAPWRITE=${TESTSDIR}/zfs-tests/cmd/mmapwrite/mmapwrite |