HomeFreeBSD

Merge branch 'illumos-2605'

Description

Merge branch 'illumos-2605'

Adds support for resuming interrupted zfs send streams and include
all related send/recv bug fixes from upstream OpenZFS.

Unlike the upstream implementation this branch does not change
the existing ioctl interface. Instead a new ZFS_IOC_RECV_NEW ioctl
was added to support resuming zfs send streams. This was done by
applying the original upstream patch and then reverting the ioctl
changes in a follow up patch. For this reason there are a handful
on commits between the relevant patches on this branch which are
not interoperable. This was done to make it easier to extract
the new ZFS_IOC_RECV_NEW and submit it upstream.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #4742

Event Timeline

Brian Behlendorf <behlendorf1@llnl.gov> committed rG5c27b2960553: Merge branch 'illumos-2605' (authored by Brian Behlendorf <behlendorf1@llnl.gov>).Jun 29 2016, 8:42 PM

Merged Changes