View | Details | Raw Unified | Return to bug 249579 | Differences between
and this patch

Collapse All | Expand All

(-)libzfs_sendrecv.c (-2 / +2 lines)
Lines 3301-3307 Link Here
3301
	boolean_t resuming = DMU_GET_FEATUREFLAGS(drrb->drr_versioninfo) &
3301
	boolean_t resuming = DMU_GET_FEATUREFLAGS(drrb->drr_versioninfo) &
3302
	    DMU_BACKUP_FEATURE_RESUMING;
3302
	    DMU_BACKUP_FEATURE_RESUMING;
3303
	stream_wantsnewfs = (drrb->drr_fromguid == 0 ||
3303
	stream_wantsnewfs = (drrb->drr_fromguid == 0 ||
3304
	    (drrb->drr_flags & DRR_FLAG_CLONE) || originsnap) && !resuming;
3304
	    (drrb->drr_flags & DRR_FLAG_CLONE) || originsnap);
3305
3305
3306
	if (stream_wantsnewfs) {
3306
	if (stream_wantsnewfs) {
3307
		/*
3307
		/*
Lines 3433-3439 Link Here
3433
		}
3433
		}
3434
3434
3435
		if (!flags->dryrun && zhp->zfs_type == ZFS_TYPE_FILESYSTEM &&
3435
		if (!flags->dryrun && zhp->zfs_type == ZFS_TYPE_FILESYSTEM &&
3436
		    (stream_wantsnewfs || resuming)) {
3436
		    stream_wantsnewfs) {
3437
			/* We can't do online recv in this case */
3437
			/* We can't do online recv in this case */
3438
			clp = changelist_gather(zhp, ZFS_PROP_NAME, 0, 0);
3438
			clp = changelist_gather(zhp, ZFS_PROP_NAME, 0, 0);
3439
			if (clp == NULL) {
3439
			if (clp == NULL) {

Return to bug 249579