Merge commit 'refs/top-bases/top' into top

openzfs · Jul 21, 2010 · c5a97e4 · c5a97e4
2 parents 889c391 + 14729bc
commit c5a97e4
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c
@@ -1135,9 +1135,8 @@ zfs_ioc_pool_destroy(struct file *filp, zfs_cmd_t *zc)
 {
 	int error;
 	zfs_log_history(zc);
-	error = zvol_remove_minors(zc->zc_name);
-	if (error == 0)
-		error = spa_destroy(zc->zc_name);
+	(void) zvol_remove_minors(zc->zc_name);
+	error = spa_destroy(zc->zc_name);
 	return (error);
 }