X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-tdb1-die-during-transaction.c;h=9ff75d10201f36c3ea90b6e121793286d46b565b;hb=a446f1d4d161d66bbb19ba2551cf6429a4865964;hp=bcd24df55492336598774c193fb79650cd2d595a;hpb=60210a73ec08a7b34ba637ad19e6749cf6dc1952;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 bcd24df5..9ff75d10 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 #include #include "tdb1-external-agent.h" -#include "tdb1-logging.h" +#include "logging.h" #undef write #undef pwrite @@ -81,7 +81,7 @@ static int ftruncate_check(int fd, off_t length) static bool test_death(enum operation op, struct agent *agent) { - struct tdb1_context *tdb = NULL; + struct tdb_context *tdb = NULL; TDB_DATA key; enum agent_return ret; int needed_recovery = 0; @@ -89,8 +89,8 @@ static bool test_death(enum operation op, struct agent *agent) current = target = 0; reset: unlink(TEST_DBNAME); - tdb = tdb1_open_ex(TEST_DBNAME, 1024, TDB_NOMMAP, - O_CREAT|O_TRUNC|O_RDWR, 0600, &taplogctx, NULL); + tdb = tdb1_open(TEST_DBNAME, 1024, TDB_NOMMAP, + O_CREAT|O_TRUNC|O_RDWR, 0600, &tap_log_attr); if (setjmp(jmpbuf) != 0) { /* We're partway through. Simulate our death. */