diff options
| author | Brian Behlendorf <[email protected]> | 2009-01-15 15:54:35 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2009-01-15 15:54:35 -0800 |
| commit | 85c77e1c823fb1ea5821ab39ebfc423f02060560 (patch) | |
| tree | 8b3f2d14de5c23f67d791689de11158d739919e4 /cmd | |
| parent | 0197f3a2989efc743143183ccd01fe3777f98727 (diff) | |
| parent | ee7f10a6b387525687dacb73f4b8b366505436c3 (diff) | |
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/ztest/ztest.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c index 310b5c489..1feac18b4 100644 --- a/cmd/ztest/ztest.c +++ b/cmd/ztest/ztest.c @@ -2938,15 +2938,18 @@ ztest_spa_import_export(char *oldname, char *newname) nvlist_free(config); } -static void -ztest_resume(spa_t *spa) +static void * +ztest_resume(void *arg) { + spa_t *spa = arg; + if (spa_suspended(spa)) { spa_vdev_state_enter(spa); vdev_clear(spa, NULL); (void) spa_vdev_state_exit(spa, NULL, 0); zio_resume(spa); } + return (NULL); } static void * |