X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-tdb1-die-during-transaction.c;h=933d748686f21dcff717f399bbf64915a790e8b4;hb=fc44729c471bcdc7ab0410448d991a65e74cec3d;hp=ae03d5f8b94d8cbc16b25b02e709167a8dbcf5a6;hpb=fab544c24c1ad6523f95893abcaec4e6cce6c2b4;p=ccan

diff --git a/ccan/tdb2/test/run-tdb1-die-during-transaction.c b/ccan/tdb2/test/run-tdb1-die-during-transaction.c
index ae03d5f8..933d7486 100644
--- a/ccan/tdb2/test/run-tdb1-die-during-transaction.c
+++ b/ccan/tdb2/test/run-tdb1-die-during-transaction.c
@@ -18,7 +18,7 @@ static int ftruncate_check(int fd, off_t length);
 #include <err.h>
 #include <setjmp.h>
 #include "tdb1-external-agent.h"
-#include "tdb1-logging.h"
+#include "logging.h"
 
 #undef write
 #undef pwrite
@@ -81,20 +81,25 @@ static int ftruncate_check(int fd, off_t length)
 
 static bool test_death(enum operation op, struct agent *agent)
 {
-	struct tdb1_context *tdb = NULL;
-	TDB1_DATA key;
+	struct tdb_context *tdb = NULL;
+	TDB_DATA key;
 	enum agent_return ret;
 	int needed_recovery = 0;
+	union tdb_attribute hsize;
+
+	hsize.base.attr = TDB_ATTRIBUTE_TDB1_HASHSIZE;
+	hsize.base.next = &tap_log_attr;
+	hsize.tdb1_hashsize.hsize = 1024;
 
 	current = target = 0;
 reset:
 	unlink(TEST_DBNAME);
-	tdb = tdb1_open_ex(TEST_DBNAME, 1024, TDB1_NOMMAP,
-			  O_CREAT|O_TRUNC|O_RDWR, 0600, &taplogctx, NULL);
+	tdb = tdb1_open(TEST_DBNAME, TDB_NOMMAP,
+			O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize);
 
 	if (setjmp(jmpbuf) != 0) {
 		/* We're partway through.  Simulate our death. */
-		close(tdb->fd);
+		close(tdb->file->fd);
 		forget_locking1();
 		in_transaction = false;
 
@@ -150,7 +155,7 @@ reset:
 	/* Put key for agent to fetch. */
 	key.dsize = strlen(KEY_STRING);
 	key.dptr = (void *)KEY_STRING;
-	if (tdb1_store(tdb, key, key, TDB1_INSERT) != 0)
+	if (tdb1_store(tdb, key, key, TDB_INSERT) != 0)
 		return false;
 
 	/* This is the key we insert in transaction. */
@@ -168,7 +173,7 @@ reset:
 	if (tdb1_transaction_start(tdb) != 0)
 		return false;
 
-	if (tdb1_store(tdb, key, key, TDB1_INSERT) != 0)
+	if (tdb1_store(tdb, key, key, TDB_INSERT) != 0)
 		return false;
 
 	if (tdb1_transaction_commit(tdb) != 0)