diff options
| author | Brian Behlendorf <[email protected]> | 2008-12-22 16:58:20 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2008-12-22 16:58:20 -0800 |
| commit | fe23f773a7cb235cca2008fcace5e31713eae085 (patch) | |
| tree | 6a363a7942caf7a9de9dbc27a82e04a9f1544395 /cmd | |
| parent | 5f7f6a3934eb405cd44a14a1332110c423ebfb2e (diff) | |
| parent | fdffe910562ca936168f7c3523606e6075a66625 (diff) | |
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/ztest/Makefile.am | 2 | ||||
| -rw-r--r-- | cmd/ztest/ztest.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cmd/ztest/Makefile.am b/cmd/ztest/Makefile.am index 9cbde71e0..f4094347c 100644 --- a/cmd/ztest/Makefile.am +++ b/cmd/ztest/Makefile.am @@ -25,4 +25,4 @@ ztest_LDADD = \ $(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzfs/libzfs.la -ztest_LDFLAGS = -pthread -lm -lz -lrt +ztest_LDFLAGS = -pthread -lm -lz -lrt -ldl diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c index 6708282ca..b270f982f 100644 --- a/cmd/ztest/ztest.c +++ b/cmd/ztest/ztest.c @@ -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] = { NULL, /* 0 no such transaction type */ - (zil_replay_func_t)ztest_replay_create, /* TX_CREATE */ + (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 */ + (zil_replay_func_t *)ztest_replay_remove,/* TX_REMOVE */ NULL, /* TX_RMDIR */ NULL, /* TX_LINK */ NULL, /* TX_RENAME */ @@ -1133,7 +1133,7 @@ ztest_vdev_attach_detach(ztest_args_t *za) (longlong_t)newsize, replacing, error, expected_error); } - (void) mutex_unlock(&ztest_shared->zs_vdev_lock); + (void) pthread_mutex_unlock(&ztest_shared->zs_vdev_lock); } /* |