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

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

This commit is contained in:
Brian Behlendorf 2008-12-22 16:56:00 -08:00
parent d011707aa2 fdffe91056
commit e7788edbfd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/ztest/Makefile.am
View File

@ -25,4 +25,4 @@ ztest_LDADD = \
$(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la $(top_builddir)/lib/libzfs/libzfs.la
ztest_LDFLAGS = -pthread -lm -lz -lrt ztest_LDFLAGS = -pthread -lm -lz -lrt -ldl

6
cmd/ztest/ztest.c
View File

@ -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 */
(zil_replay_func_t)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 */
(zil_replay_func_t)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 */
@ -1133,7 +1133,7 @@ ztest_vdev_attach_detach(ztest_args_t *za)
(longlong_t)newsize, replacing, error, expected_error); (longlong_t)newsize, replacing, error, expected_error);
} }
(void) mutex_unlock(&ztest_shared->zs_vdev_lock); (void) pthread_mutex_unlock(&ztest_shared->zs_vdev_lock);
} }
/* /*