aboutsummaryrefslogtreecommitdiffstats
path: root/module/zfs
diff options
context:
space:
mode:
authorGeorge Melikov <[email protected]>2017-01-31 02:33:46 +0300
committerBrian Behlendorf <[email protected]>2017-01-30 15:33:46 -0800
commite2da829cc1a92b9f0ebd1eeefc6fadc1ec9f325a (patch)
treefa28e95627d2ba0cb712a318e3b13c08f5cc8326 /module/zfs
parent28b40c8a6e31308531de0ab128887e65c28d891c (diff)
OpenZFS 6922 - Emit ESC_ZFS_VDEV_REMOVE_AUX after removing an aux device
Authored by: Alan Somers <[email protected]> Reviewed by: George Wilson <[email protected]> Reviewed by: Matthew Ahrens <[email protected]> Approved by: Dan McDonald <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Ported-by: George Melikov <[email protected]> OpenZFS-issue: https://www.illumos.org/issues/6922 OpenZFS-commit: https://github.com/openzfs/openzfs/commit/63364b0 Closes #5690
Diffstat (limited to 'module/zfs')
-rw-r--r--module/zfs/spa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/module/zfs/spa.c b/module/zfs/spa.c
index 73512ddb2..f82847c82 100644
--- a/module/zfs/spa.c
+++ b/module/zfs/spa.c
@@ -5548,7 +5548,7 @@ spa_vdev_remove(spa_t *spa, uint64_t guid, boolean_t unspare)
}
if (!locked)
- return (spa_vdev_exit(spa, NULL, txg, error));
+ error = spa_vdev_exit(spa, NULL, txg, error);
return (error);
}