diff options
| author | Matthew Ahrens <[email protected]> | 2013-09-04 07:00:57 -0500 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2013-09-04 16:01:24 -0700 |
| commit | 13fe019870c8779bf2f5b3ff731b512cf89133ef (patch) | |
| tree | 67a9c6989bcb7c2ca6d0455c14713bcbf1899da6 /module/zpios/pios.c | |
| parent | 6f1ffb06655008c9b519108ed29fbf03acd6e5de (diff) | |
Illumos #3464
3464 zfs synctask code needs restructuring
Reviewed by: Dan Kimmel <[email protected]>
Reviewed by: Adam Leventhal <[email protected]>
Reviewed by: George Wilson <[email protected]>
Reviewed by: Christopher Siden <[email protected]>
Approved by: Garrett D'Amore <[email protected]>
References:
https://www.illumos.org/issues/3464
illumos/illumos-gate@3b2aab18808792cbd248a12f1edf139b89833c13
Ported-by: Tim Chase <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #1495
Diffstat (limited to 'module/zpios/pios.c')
| -rw-r--r-- | module/zpios/pios.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/module/zpios/pios.c b/module/zpios/pios.c index 53cc77bd9..be56b771d 100644 --- a/module/zpios/pios.c +++ b/module/zpios/pios.c @@ -34,6 +34,7 @@ #include <sys/zfs_context.h> #include <sys/dmu.h> #include <sys/txg.h> +#include <sys/dsl_destroy.h> #include <linux/cdev.h> #include "zpios-internal.h" @@ -224,9 +225,9 @@ zpios_dmu_setup(run_args_t *run_args) run_args->os = os; out_destroy: if (rc) { - rc2 = dmu_objset_destroy(name, B_FALSE); + rc2 = dsl_destroy_head(name); if (rc2) - zpios_print(run_args->file, "Error dmu_objset_destroy" + zpios_print(run_args->file, "Error dsl_destroy_head" "(%s, ...) failed: %d\n", name, rc2); } out: @@ -395,9 +396,9 @@ zpios_remove_objset(run_args_t *run_args) dmu_objset_disown(run_args->os, zpios_tag); if (run_args->flags & DMU_REMOVE) { - rc = dmu_objset_destroy(name, B_FALSE); + rc = dsl_destroy_head(name); if (rc) - zpios_print(run_args->file, "Error dmu_objset_destroy" + zpios_print(run_args->file, "Error dsl_destroy_head" "(%s, ...) failed: %d\n", name, rc); } |