summaryrefslogtreecommitdiffstats
path: root/contrib/diff/src/ifdef.c
diff options
context:
space:
mode:
authormav <mav@FreeBSD.org>2016-10-14 07:37:08 +0000
committermav <mav@FreeBSD.org>2016-10-14 07:37:08 +0000
commit6ddf83c30a58a45a62eb5ec40328af32f370b376 (patch)
tree52b23f4ef99fe69fe66ef0072444c47bc3291ebd /contrib/diff/src/ifdef.c
parent9d79919eb31d7b8124ebe1aaae900b0258ae67e1 (diff)
downloadFreeBSD-src-6ddf83c30a58a45a62eb5ec40328af32f370b376.zip
FreeBSD-src-6ddf83c30a58a45a62eb5ec40328af32f370b376.tar.gz
MFC r305339: MFV r305336: 7247 zfs receive of deduplicated stream fails
This resolves two 'zfs recv' issues. First, when receiving into an existing filesystem, a snapshot created during the receive process is not added to the guid->dataset map for the stream, resulting in failed lookups for deduped streams when a WRITE_BYREF record refers to a snapshot received earlier in the stream. Second, the newly created snapshot was also not set properly, referencing the snapshot before the new receiving dataset rather than the existing filesystem. Closes #159 Reviewed by: Matthew Ahrens <mahrens@delphix.com> Reviewed by: Dan Kimmel <dan.kimmel@delphix.com> Author: Chris Williamson <chris.williamson@delphix.com> openzfs/openzfs@b09697c8c18be68abfe538de9809938239402ae8
Diffstat (limited to 'contrib/diff/src/ifdef.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud