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

This commit is contained in:
Brian Behlendorf 2009-01-15 15:54:33 -08:00
commit 38c24b7107
1 changed files with 5 additions and 2 deletions

View File

@ -2937,15 +2937,18 @@ ztest_spa_import_export(char *oldname, char *newname)
nvlist_free(config); nvlist_free(config);
} }
static void static void *
ztest_resume(spa_t *spa) ztest_resume(void *arg)
{ {
spa_t *spa = arg;
if (spa_suspended(spa)) { if (spa_suspended(spa)) {
spa_vdev_state_enter(spa); spa_vdev_state_enter(spa);
vdev_clear(spa, NULL); vdev_clear(spa, NULL);
(void) spa_vdev_state_exit(spa, NULL, 0); (void) spa_vdev_state_exit(spa, NULL, 0);
zio_resume(spa); zio_resume(spa);
} }
return (NULL);
} }
static void * static void *