From e2da829cc1a92b9f0ebd1eeefc6fadc1ec9f325a Mon Sep 17 00:00:00 2001
From: George Melikov <mail@gmelikov.ru>
Date: Tue, 31 Jan 2017 02:33:46 +0300
Subject: [PATCH] OpenZFS 6922 - Emit ESC_ZFS_VDEV_REMOVE_AUX after removing an
 aux device

Authored by: Alan Somers <asomers@gmail.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Approved by: Dan McDonald <danmcd@omniti.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Ported-by: George Melikov <mail@gmelikov.ru>

OpenZFS-issue: https://www.illumos.org/issues/6922
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/63364b0
Closes #5690
---
 module/zfs/spa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/zfs/spa.c b/module/zfs/spa.c
index 73512ddb28..f82847c82f 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);
 }