X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftdb1_transaction.c;fp=ccan%2Ftdb2%2Ftdb1_transaction.c;h=ecd7d2628e4981e42634da4617c6581f831a0d87;hp=08eac1df3406b603570ea626bbdf580ac8f635d8;hb=332d0c29baa6896e67c439aeb47f58a104fbc781;hpb=b8e64e9346793164651a36eccb3c205077e5c91b;ds=sidebyside diff --git a/ccan/tdb2/tdb1_transaction.c b/ccan/tdb2/tdb1_transaction.c index 08eac1df..ecd7d262 100644 --- a/ccan/tdb2/tdb1_transaction.c +++ b/ccan/tdb2/tdb1_transaction.c @@ -1289,14 +1289,14 @@ int tdb1_transaction_recover(struct tdb_context *tdb) } /* Any I/O failures we say "needs recovery". */ -bool tdb1_needs_recovery(struct tdb_context *tdb) +tdb_bool_err tdb1_needs_recovery(struct tdb_context *tdb) { tdb1_off_t recovery_head; struct tdb1_record rec; /* find the recovery area */ if (tdb1_ofs_read(tdb, TDB1_RECOVERY_HEAD, &recovery_head) == -1) { - return true; + return tdb->last_error; } if (recovery_head == 0) { @@ -1307,7 +1307,7 @@ bool tdb1_needs_recovery(struct tdb_context *tdb) /* read the recovery record */ if (tdb->tdb1.io->tdb1_read(tdb, recovery_head, &rec, sizeof(rec), TDB1_DOCONV()) == -1) { - return true; + return tdb->last_error; } return (rec.magic == TDB1_RECOVERY_MAGIC);