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

Merge commit 'refs/top-bases/linux-libspl' into linux-libspl

This commit is contained in:
Brian Behlendorf 2009-07-06 15:42:01 -07:00
parent ab16fdc9ad 69b2257940
commit 7923799643
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/ztest/ztest.c
View File

@ -1257,7 +1257,7 @@ ztest_vdev_LUN_growth(ztest_args_t *za)
size_t psize, newsize; size_t psize, newsize;
uint64_t spa_newsize, spa_cursize, ms_count; uint64_t spa_newsize, spa_cursize, ms_count;
(void) mutex_lock(&ztest_shared->zs_vdev_lock); (void) pthread_mutex_lock(&ztest_shared->zs_vdev_lock);
mutex_enter(&spa_namespace_lock); mutex_enter(&spa_namespace_lock);
spa_config_enter(spa, SCL_STATE, spa, RW_READER); spa_config_enter(spa, SCL_STATE, spa, RW_READER);
@ -1285,7 +1285,7 @@ ztest_vdev_LUN_growth(ztest_args_t *za)
if (psize == 0 || psize >= 4 * zopt_vdev_size) { if (psize == 0 || psize >= 4 * zopt_vdev_size) {
spa_config_exit(spa, SCL_STATE, spa); spa_config_exit(spa, SCL_STATE, spa);
mutex_exit(&spa_namespace_lock); mutex_exit(&spa_namespace_lock);
(void) mutex_unlock(&ztest_shared->zs_vdev_lock); (void) pthread_mutex_unlock(&ztest_shared->zs_vdev_lock);
return; return;
} }
ASSERT(psize > 0); ASSERT(psize > 0);
@ -1314,7 +1314,7 @@ ztest_vdev_LUN_growth(ztest_args_t *za)
} }
(void) spa_config_exit(spa, SCL_STATE, spa); (void) spa_config_exit(spa, SCL_STATE, spa);
mutex_exit(&spa_namespace_lock); mutex_exit(&spa_namespace_lock);
(void) mutex_unlock(&ztest_shared->zs_vdev_lock); (void) pthread_mutex_unlock(&ztest_shared->zs_vdev_lock);
return; return;
} }
@ -1354,7 +1354,7 @@ ztest_vdev_LUN_growth(ztest_args_t *za)
spa->spa_name, oldnumbuf, newnumbuf); spa->spa_name, oldnumbuf, newnumbuf);
} }
spa_config_exit(spa, SCL_STATE, spa); spa_config_exit(spa, SCL_STATE, spa);
(void) mutex_unlock(&ztest_shared->zs_vdev_lock); (void) pthread_mutex_unlock(&ztest_shared->zs_vdev_lock);
} }
/* ARGSUSED */ /* ARGSUSED */
@ -1663,7 +1663,7 @@ ztest_dsl_dataset_promote_busy(ztest_args_t *za)
char osname[MAXNAMELEN]; char osname[MAXNAMELEN];
uint64_t curval = za->za_instance; uint64_t curval = za->za_instance;
(void) rw_rdlock(&ztest_shared->zs_name_lock); (void) pthread_rwlock_rdlock(&ztest_shared->zs_name_lock);
dmu_objset_name(os, osname); dmu_objset_name(os, osname);
ztest_dsl_dataset_cleanup(osname, curval); ztest_dsl_dataset_cleanup(osname, curval);
@ -1748,7 +1748,7 @@ ztest_dsl_dataset_promote_busy(ztest_args_t *za)
out: out:
ztest_dsl_dataset_cleanup(osname, curval); ztest_dsl_dataset_cleanup(osname, curval);
(void) rw_unlock(&ztest_shared->zs_name_lock); (void) pthread_rwlock_unlock(&ztest_shared->zs_name_lock);
} }
/* /*
@ -2710,18 +2710,18 @@ ztest_dmu_write_parallel(ztest_args_t *za)
za->za_dbuf = NULL; za->za_dbuf = NULL;
if (error) { if (error) {
(void) mutex_unlock(lp); (void) pthread_mutex_unlock(lp);
return; return;
} }
if (blk.blk_birth == 0) { /* concurrent free */ if (blk.blk_birth == 0) { /* concurrent free */
(void) mutex_unlock(lp); (void) pthread_mutex_unlock(lp);
return; return;
} }
txg_suspend(dmu_objset_pool(os)); txg_suspend(dmu_objset_pool(os));
(void) mutex_unlock(lp); (void) pthread_mutex_unlock(lp);
ASSERT(blk.blk_fill == 1); ASSERT(blk.blk_fill == 1);
ASSERT3U(BP_GET_TYPE(&blk), ==, DMU_OT_UINT64_OTHER); ASSERT3U(BP_GET_TYPE(&blk), ==, DMU_OT_UINT64_OTHER);