diff options
| author | Alexander Eremin <[email protected]> | 2015-07-11 01:45:01 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-07-14 10:27:46 -0700 |
| commit | 1cddb8c9ff072643a9d9f8726f0480b5a57d9bcd (patch) | |
| tree | bdab6e36feb96f7fb9a17cd36d4170848af2c870 | |
| parent | eaa52d32b0784b1d6ceb1299bb520300506f58bf (diff) | |
Illumos 5610 - zfs clone from different source and target pools produces coredump
5610 zfs clone from different source and target pools produces coredump
Reviewed by: Josef 'Jeff' Sipek <[email protected]>
Reviewed by: Matthew Ahrens <[email protected]>
Approved by: Dan McDonald <[email protected]>
References:
https://github.com/illumos/illumos-gate/commit/03b1c29
https://www.illumos.org/issues/5610
https://www.illumos.org/issues/5824
https://github.com/zfsonlinux/zfs/issues/2911
https://github.com/zfsonlinux/zfs/commit/9063f65
Ported-by: kernelOfTruth [email protected]
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #3584
| -rw-r--r-- | module/zfs/dmu_objset.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/module/zfs/dmu_objset.c b/module/zfs/dmu_objset.c index bd953dc36..56a804dfb 100644 --- a/module/zfs/dmu_objset.c +++ b/module/zfs/dmu_objset.c @@ -24,6 +24,7 @@ * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved. + * Copyright (c) 2015 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2015, STRATO AG, Inc. All rights reserved. */ @@ -949,11 +950,7 @@ dmu_objset_clone_check(void *arg, dmu_tx_t *tx) dsl_dir_rele(pdd, FTAG); return (SET_ERROR(EEXIST)); } - /* You can't clone across pools. */ - if (pdd->dd_pool != dp) { - dsl_dir_rele(pdd, FTAG); - return (SET_ERROR(EXDEV)); - } + error = dsl_fs_ss_limit_check(pdd, 1, ZFS_PROP_FILESYSTEM_LIMIT, NULL, doca->doca_cred); if (error != 0) { @@ -966,12 +963,6 @@ dmu_objset_clone_check(void *arg, dmu_tx_t *tx) if (error != 0) return (error); - /* You can't clone across pools. */ - if (origin->ds_dir->dd_pool != dp) { - dsl_dataset_rele(origin, FTAG); - return (SET_ERROR(EXDEV)); - } - /* You can only clone snapshots, not the head datasets. */ if (!origin->ds_is_snapshot) { dsl_dataset_rele(origin, FTAG); |