diff options
| author | Matthew Ahrens <[email protected]> | 2013-07-29 10:55:16 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2013-11-04 11:18:14 -0800 |
| commit | 19580676295b4e271da63dce145bb17c3731d069 (patch) | |
| tree | 1e888ba2b2ec87583cf961586f21d9837ec14751 /module/zfs/dsl_destroy.c | |
| parent | 96c2e961938d4018ddb393fa60e004d8a91a58e9 (diff) | |
Illumos #3888
3888 zfs recv -F should destroy any snapshots created since
the incremental source
Reviewed by: George Wilson <[email protected]>
Reviewed by: Adam Leventhal <[email protected]>
Reviewed by: Peng Dai <[email protected]>
Approved by: Richard Lowe <[email protected]>
References:
https://www.illumos.org/issues/3888
illumos/illumos-gate@34f2f8cf94052481c81be2e134b94a00b501bf21
Porting notes:
1. Commit 1fde1e37208c2f56c72c70a06676676f04b65998 wrapped a
declaration in dsl_dataset_modified_since_lastsnap in ASSERTV().
The ASSERTV() and local variable have been removed to avoid an
unused variable warning.
Signed-off-by: Brian Behlendorf <[email protected]>
Ported-by: Richard Yao <[email protected]>
Issue #1775
Diffstat (limited to 'module/zfs/dsl_destroy.c')
| -rw-r--r-- | module/zfs/dsl_destroy.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/module/zfs/dsl_destroy.c b/module/zfs/dsl_destroy.c index 1c4c3deec..0e741105d 100644 --- a/module/zfs/dsl_destroy.c +++ b/module/zfs/dsl_destroy.c @@ -46,10 +46,7 @@ typedef struct dmu_snapshots_destroy_arg { nvlist_t *dsda_errlist; } dmu_snapshots_destroy_arg_t; -/* - * ds must be owned. - */ -static int +int dsl_destroy_snapshot_check_impl(dsl_dataset_t *ds, boolean_t defer) { if (!dsl_dataset_is_snapshot(ds)) |