mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-22 02:27:36 +03:00
Illumos #3464
3464 zfs synctask code needs restructuring Reviewed by: Dan Kimmel <dan.kimmel@delphix.com> Reviewed by: Adam Leventhal <ahl@delphix.com> Reviewed by: George Wilson <george.wilson@delphix.com> Reviewed by: Christopher Siden <christopher.siden@delphix.com> Approved by: Garrett D'Amore <garrett@damore.org> References: https://www.illumos.org/issues/3464 illumos/illumos-gate@3b2aab1880 Ported-by: Tim Chase <tim@chase2k.com> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes #1495
This commit is contained in:
committed by
Brian Behlendorf
parent
6f1ffb0665
commit
13fe019870
+5
-4
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user