summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorvitezslav batrla - Sun Microsystems - Prague Czech Republic <Vitezslav.Batrla@Sun.COM>2009-10-20 18:08:24 +0200
committervitezslav batrla - Sun Microsystems - Prague Czech Republic <Vitezslav.Batrla@Sun.COM>2009-10-20 18:08:24 +0200
commit4aed9999406f759bcff27cbee0f04d1893a5ca3d (patch)
tree04d2297dab4a8d988a8ecb2266f6c551605103fe /usr/src
parent948e002c09c52ce4779814aa0b78f2f0f5bde9aa (diff)
downloadillumos-gate-4aed9999406f759bcff27cbee0f04d1893a5ca3d.tar.gz
6482588 zfs destroy -r aborts and dumps core when destroying a file system (while snapshotting is going on)
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/uts/common/fs/zfs/dsl_dataset.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/uts/common/fs/zfs/dsl_dataset.c b/usr/src/uts/common/fs/zfs/dsl_dataset.c
index 59162d78d5..20c7bb87a2 100644
--- a/usr/src/uts/common/fs/zfs/dsl_dataset.c
+++ b/usr/src/uts/common/fs/zfs/dsl_dataset.c
@@ -1284,7 +1284,7 @@ dsl_dataset_destroy_begin_check(void *arg1, void *arg2, dmu_tx_t *tx)
*/
if (ds->ds_prev != NULL &&
ds->ds_prev->ds_phys->ds_next_snap_obj == ds->ds_object)
- return (EINVAL);
+ return (EBUSY);
/*
* This is really a dsl_dir thing, but check it here so that
@@ -1380,7 +1380,7 @@ dsl_dataset_destroy_check(void *arg1, void *arg2, dmu_tx_t *tx)
*/
if (ds->ds_prev != NULL &&
ds->ds_prev->ds_phys->ds_next_snap_obj == ds->ds_object)
- return (EINVAL);
+ return (EBUSY);
/*
* If we made changes this txg, traverse_dsl_dataset won't find