From d6ea5e8cefb4e72e5c8065909ef75371aa2da6f2 Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 25 Jun 2010 23:04:21 -0700
Subject: [PATCH] Additional ZVOL cleanup in zvol_set_volsize()

The following cleanup was missed in the first pass when the ZVOL
implementation was updated.  An extra instance of a zvol_state_t
was removed from the stack and the error handling was simplified.
---
 module/zfs/zvol.c | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c
index 333b3fb9d1..ffbb29251c 100644
--- a/module/zfs/zvol.c
+++ b/module/zfs/zvol.c
@@ -275,8 +275,6 @@ zvol_set_volsize(const char *name, uint64_t volsize)
 	zvol_state_t *zv;
 	dmu_object_info_t doi;
 	objset_t *os = NULL;
-	zvol_state_t state = { 0 };
-	uint64_t old_volsize = 0ULL;
 	uint64_t readonly;
 	int error;
 
@@ -284,24 +282,24 @@ zvol_set_volsize(const char *name, uint64_t volsize)
 
 	zv = zvol_find_by_name(name);
 	if (zv == NULL) {
-		error = dmu_objset_hold(name, FTAG, &os);
-		if (error)
-			goto out;
-		zv = &state;
+		error = ENXIO;
+		goto out;
 	}
 
+	error = dmu_objset_hold(name, FTAG, &os);
+	if (error)
+		goto out;
+
+	if ((error = dmu_object_info(os, ZVOL_OBJ, &doi)) != 0 ||
+	    (error = zvol_check_volsize(volsize,doi.doi_data_block_size)) != 0)
+		goto out;
+
 	VERIFY(dsl_prop_get_integer(name, "readonly", &readonly, NULL) == 0);
 	if (readonly) {
 		error = EROFS;
 		goto out;
 	}
 
-	old_volsize = zv->zv_volsize;
-
-	if ((error = dmu_object_info(os, ZVOL_OBJ, &doi)) != 0 ||
-	    (error = zvol_check_volsize(volsize,doi.doi_data_block_size)) != 0)
-		goto out;
-
 	if (get_disk_ro(zv->zv_disk) || (zv->zv_flags & ZVOL_RDONLY)) {
 		error = EROFS;
 		goto out;