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

Merge branch 'feature-branch' into refs/top-bases/zfs-branch 

Conflicts:

	cmd/ztest/ztest.c
This commit is contained in:
Brian Behlendorf 2009-07-06 13:17:16 -07:00
parent 4e59805d98 8d4f19348a
commit 926b04acba
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/ztest/ztest.c
View File

@ -1257,8 +1257,8 @@ ztest_vdev_LUN_growth(ztest_args_t *za)
size_t psize, newsize;
uint64_t spa_newsize, spa_cursize, ms_count;
(void) pthread_mutex_lock(&ztest_shared->zs_vdev_lock);
pthread_mutex_enter(&spa_namespace_lock);
(void) mutex_lock(&ztest_shared->zs_vdev_lock);
mutex_enter(&spa_namespace_lock);
spa_config_enter(spa, SCL_STATE, spa, RW_READER);
while (tvd == NULL || tvd->vdev_islog) {