Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2010-06-28 11:31:50 -07:00
parent 699cf2179f 01f2707edd
commit f44dd08b58
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/ztest/ztest.c
View File

@ -5275,6 +5275,11 @@ ztest_run(ztest_shared_t *zs)
} }
kernel_fini(); kernel_fini();
list_destroy(&zcl.zcl_callbacks);
mutex_destroy(&zcl.zcl_callbacks_lock);
rw_destroy(&zs->zs_name_lock);
mutex_destroy(&zs->zs_vdev_lock);
} }
static void static void
@ -5345,12 +5350,8 @@ ztest_freeze(ztest_shared_t *zs)
spa_close(spa, FTAG); spa_close(spa, FTAG);
kernel_fini(); kernel_fini();
list_destroy(&zcl.zcl_callbacks); rw_destroy(&zs->zs_name_lock);
mutex_destroy(&zs->zs_vdev_lock);
(void) mutex_destroy(&zcl.zcl_callbacks_lock);
(void) rw_destroy(&zs->zs_name_lock);
(void) mutex_destroy(&zs->zs_vdev_lock);
} }
void void
@ -5453,6 +5454,7 @@ main(int argc, char **argv)
ztest_random_fd = open("/dev/urandom", O_RDONLY); ztest_random_fd = open("/dev/urandom", O_RDONLY);
dprintf_setup(&argc, argv);
process_options(argc, argv); process_options(argc, argv);
/* Override location of zpool.cache */ /* Override location of zpool.cache */