usr/src/uts/common/fs/zfs/spa.c
changeset 11819 8b1fd81afb05
parent 11817 b27edb6d5047
child 11820 c69aaf82df80
--- a/usr/src/uts/common/fs/zfs/spa.c	Wed Feb 24 12:33:20 2010 -0800
+++ b/usr/src/uts/common/fs/zfs/spa.c	Wed Feb 24 16:01:27 2010 -0700
@@ -2190,8 +2190,6 @@
     nvlist_t **config)
 {
 	spa_t *spa;
-	zpool_rewind_policy_t policy;
-	spa_load_state_t state = SPA_LOAD_OPEN;
 	int error;
 	int locked = B_FALSE;
 
@@ -2214,11 +2212,14 @@
 		return (ENOENT);
 	}
 
-	zpool_get_rewind_policy(nvpolicy ? nvpolicy : spa->spa_config, &policy);
-	if (policy.zrp_request & ZPOOL_DO_REWIND)
-		state = SPA_LOAD_RECOVER;
-
 	if (spa->spa_state == POOL_STATE_UNINITIALIZED) {
+		spa_load_state_t state = SPA_LOAD_OPEN;
+		zpool_rewind_policy_t policy;
+
+		zpool_get_rewind_policy(nvpolicy ? nvpolicy : spa->spa_config,
+		    &policy);
+		if (policy.zrp_request & ZPOOL_DO_REWIND)
+			state = SPA_LOAD_RECOVER;
 
 		spa_activate(spa, spa_mode_global);