X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Fcheck.c;h=ab6621ea85b4596aa192c3b53a9dc1aab73de366;hb=63e80faf9b42fbe73e25c804dd734b6179e42c24;hp=ad736c6829a7a5d6d64297553235d892dfad61aa;hpb=f1069e4a2d5a8115695fb8ea3e78dbdcf389aead;p=ccan diff --git a/ccan/tdb2/check.c b/ccan/tdb2/check.c index ad736c68..ab6621ea 100644 --- a/ccan/tdb2/check.c +++ b/ccan/tdb2/check.c @@ -492,7 +492,7 @@ static enum TDB_ERROR check_free(struct tdb_context *tdb, (long long)off, bucket, size_to_bucket(frec_len(frec))); } - if (prev != frec_prev(frec)) { + if (prev && prev != frec_prev(frec)) { return tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR, "tdb_check: offset %llu bad prev" " (%llu vs %llu)", @@ -528,11 +528,13 @@ static enum TDB_ERROR check_free_table(struct tdb_context *tdb, } for (i = 0; i < TDB_FREE_BUCKETS; i++) { - tdb_off_t off, prev = 0, *p; + tdb_off_t off, prev = 0, *p, first = 0; struct tdb_free_record f; h = bucket_off(ftable_off, i); for (off = tdb_read_off(tdb, h); off; off = f.next) { + if (!first) + first = off; if (TDB_OFF_IS_ERR(off)) { return off; } @@ -559,6 +561,18 @@ static enum TDB_ERROR check_free_table(struct tdb_context *tdb, (*num_found)++; prev = off; } + + if (first) { + /* Now we can check first back pointer. */ + ecode = tdb_read_convert(tdb, first, &f, sizeof(f)); + if (ecode != TDB_SUCCESS) { + return ecode; + } + ecode = check_free(tdb, first, &f, prev, ftable_num, i); + if (ecode != TDB_SUCCESS) { + return ecode; + } + } } return TDB_SUCCESS; }