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

Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem

This commit is contained in:
Brian Behlendorf 2008-12-22 16:33:00 -08:00
parent 65b68493f1 36c5ea8174
commit 96fa974a2e
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/ztest/ztest.c
View File

@ -260,7 +260,7 @@ static void usage(boolean_t) __NORETURN;
* debugging facilities. * debugging facilities.
*/ */
const char * const char *
_umem_debug_init() _umem_debug_init(void)
{ {
return ("default,verbose"); /* $UMEM_DEBUG setting */ return ("default,verbose"); /* $UMEM_DEBUG setting */
} }
@ -764,11 +764,11 @@ ztest_replay_remove(ztest_replay_t *zr, lr_remove_t *lr, boolean_t byteswap)
zil_replay_func_t *ztest_replay_vector[TX_MAX_TYPE] = { zil_replay_func_t *ztest_replay_vector[TX_MAX_TYPE] = {
NULL, /* 0 no such transaction type */ NULL, /* 0 no such transaction type */
ztest_replay_create, /* TX_CREATE */ (zil_replay_func_t)ztest_replay_create, /* TX_CREATE */
NULL, /* TX_MKDIR */ NULL, /* TX_MKDIR */
NULL, /* TX_MKXATTR */ NULL, /* TX_MKXATTR */
NULL, /* TX_SYMLINK */ NULL, /* TX_SYMLINK */
ztest_replay_remove, /* TX_REMOVE */ (zil_replay_func_t)ztest_replay_remove, /* TX_REMOVE */
NULL, /* TX_RMDIR */ NULL, /* TX_RMDIR */
NULL, /* TX_LINK */ NULL, /* TX_LINK */
NULL, /* TX_RENAME */ NULL, /* TX_RENAME */
@ -987,7 +987,7 @@ ztest_vdev_attach_detach(ztest_args_t *za)
int oldvd_is_log; int oldvd_is_log;
int error, expected_error; 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); 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) if (error != 0 && error != ENODEV && error != EBUSY)
fatal(0, "detach (%s) returned %d", fatal(0, "detach (%s) returned %d",
oldpath, error); oldpath, error);
(void) mutex_unlock(&ztest_shared->zs_vdev_lock); (void) pthread_mutex_unlock(&ztest_shared->zs_vdev_lock);
return; return;
} }