c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-27 03:19:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Illumos 5912 - full stream can not be force-received into a dataset if it has a snapshot

Browse Source 
5912 full stream can not be force-received into a dataset if it has a snapshot
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Paul Dagnelie <pcd@delphix.com>
Approved by: Dan McDonald <danmcd@omniti.com>

References:
  https://www.illumos.org/issues/5912
  https://github.com/illumos/illumos-gate/commit/5bae108

Ported-by: Andriy Gapon <avg@FreeBSD.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #3549
This commit is contained in:
Andriy Gapon 2015-07-02 16:03:31 +03:00 committed by Brian Behlendorf
parent a7b10a9319
commit cf50a2b08f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
module/zfs/dmu_send.c
View File

@ -1036,10 +1036,12 @@ recv_begin_check_existing_impl(dmu_recv_begin_arg_t *drba, dsl_dataset_t *ds,
dsl_dataset_rele(snap, FTAG); dsl_dataset_rele(snap, FTAG);
} else { } else {
/* if full, most recent snapshot must be $ORIGIN */ /* if full, then must be forced */
if (dsl_dataset_phys(ds)->ds_prev_snap_txg >= TXG_INITIAL) if (!drba->drba_cookie->drc_force)
return (SET_ERROR(ENODEV)); return (SET_ERROR(EEXIST));
drba->drba_snapobj = dsl_dataset_phys(ds)->ds_prev_snap_obj; /* start from $ORIGIN@$ORIGIN, if supported */
drba->drba_snapobj = dp->dp_origin_snap != NULL ?
dp->dp_origin_snap->ds_object : 0;
} }
return (0); return (0);