summaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2008-12-22 16:30:37 -0800
committerBrian Behlendorf <[email protected]>2008-12-22 16:30:37 -0800
commit36c5ea81741dc1558661a5ffb13da3817cabfc72 (patch)
treea0444f6388cdd92484d7bac6342be5462769aeeb /cmd
parent419cff0fd3a4cb4b69d76e87c32208267f514cd6 (diff)
parent43abce68c52c47fdc131e6caa4a1453ef893edaf (diff)
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
Diffstat (limited to 'cmd')
-rw-r--r--cmd/ztest/ztest.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c
index 232f5255c..ece85f46e 100644
--- a/cmd/ztest/ztest.c
+++ b/cmd/ztest/ztest.c
@@ -260,7 +260,7 @@ static void usage(boolean_t) __NORETURN;
* debugging facilities.
*/
const char *
-_umem_debug_init()
+_umem_debug_init(void)
{
return ("default,verbose"); /* $UMEM_DEBUG setting */
}
@@ -763,19 +763,19 @@ ztest_replay_remove(ztest_replay_t *zr, lr_remove_t *lr, boolean_t byteswap)
}
zil_replay_func_t *ztest_replay_vector[TX_MAX_TYPE] = {
- NULL, /* 0 no such transaction type */
- ztest_replay_create, /* TX_CREATE */
- NULL, /* TX_MKDIR */
- NULL, /* TX_MKXATTR */
- NULL, /* TX_SYMLINK */
- ztest_replay_remove, /* TX_REMOVE */
- NULL, /* TX_RMDIR */
- NULL, /* TX_LINK */
- NULL, /* TX_RENAME */
- NULL, /* TX_WRITE */
- NULL, /* TX_TRUNCATE */
- NULL, /* TX_SETATTR */
- NULL, /* TX_ACL */
+ NULL, /* 0 no such transaction type */
+ (zil_replay_func_t)ztest_replay_create, /* TX_CREATE */
+ NULL, /* TX_MKDIR */
+ NULL, /* TX_MKXATTR */
+ NULL, /* TX_SYMLINK */
+ (zil_replay_func_t)ztest_replay_remove, /* TX_REMOVE */
+ NULL, /* TX_RMDIR */
+ NULL, /* TX_LINK */
+ NULL, /* TX_RENAME */
+ NULL, /* TX_WRITE */
+ NULL, /* TX_TRUNCATE */
+ NULL, /* TX_SETATTR */
+ NULL, /* TX_ACL */
};
/*
@@ -987,7 +987,7 @@ ztest_vdev_attach_detach(ztest_args_t *za)
int oldvd_is_log;
int error, expected_error;
- (void) mutex_lock(&ztest_shared->zs_vdev_lock);
+ (void) pthread_mutex_lock(&ztest_shared->zs_vdev_lock);
spa_config_enter(spa, SCL_VDEV, FTAG, RW_READER);
@@ -1040,7 +1040,7 @@ ztest_vdev_attach_detach(ztest_args_t *za)
if (error != 0 && error != ENODEV && error != EBUSY)
fatal(0, "detach (%s) returned %d",
oldpath, error);
- (void) mutex_unlock(&ztest_shared->zs_vdev_lock);
+ (void) pthread_mutex_unlock(&ztest_shared->zs_vdev_lock);
return;
}