svn commit: r237746 - stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Martin Matuska]

Author: mm
Date: Fri Jun 29 06:41:03 2012
New Revision: 237746
URL: http://svn.freebsd.org/changeset/base/237746

Log:
  MFC r237458:
  Import Illumos revision 13736:9f1d48e1681f
  2901 ZFS receive fails for exabyte sparse files
  
  References:
  https://www.illumos.org/issues/2901
  
  Obtained from:	illumos (issue #2901)

Modified:
  stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)

Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c	Fri Jun 29 06:06:19 2012	(r237745)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c	Fri Jun 29 06:41:03 2012	(r237746)
@@ -96,6 +96,9 @@ dump_free(dmu_sendarg_t *dsp, uint64_t o
 {
 	struct drr_free *drrf = &(dsp->dsa_drr->drr_u.drr_free);
 
+	if (length != -1ULL && offset + length < offset)
+		length = -1ULL;
+
 	/*
 	 * If there is a pending op, but it's not PENDING_FREE, push it out,
 	 * since free block aggregation can only be done for blocks of the