size_t *num_found,
enum TDB_ERROR (*check)(TDB_DATA,
TDB_DATA, void *),
- void *private_data);
+ void *data);
static enum TDB_ERROR check_hash_chain(struct tdb_context *tdb,
tdb_off_t off,
enum TDB_ERROR (*check)(TDB_DATA,
TDB_DATA,
void *),
- void *private_data)
+ void *data)
{
struct tdb_used_record rec;
enum TDB_ERROR ecode;
off += sizeof(rec);
ecode = check_hash_tree(tdb, off, 0, hash, 64,
- used, num_used, num_found, check, private_data);
+ used, num_used, num_found, check, data);
if (ecode != TDB_SUCCESS) {
return ecode;
}
return TDB_SUCCESS;
(*num_found)++;
return check_hash_chain(tdb, off, hash, used, num_used, num_found,
- check, private_data);
+ check, data);
}
static enum TDB_ERROR check_hash_record(struct tdb_context *tdb,
enum TDB_ERROR (*check)(TDB_DATA,
TDB_DATA,
void *),
- void *private_data)
+ void *data)
{
struct tdb_used_record rec;
enum TDB_ERROR ecode;
if (hprefix_bits >= 64)
return check_hash_chain(tdb, off, hprefix, used, num_used,
- num_found, check, private_data);
+ num_found, check, data);
ecode = tdb_read_convert(tdb, off, &rec, sizeof(rec));
if (ecode != TDB_SUCCESS) {
return check_hash_tree(tdb, off,
TDB_SUBLEVEL_HASH_BITS-TDB_HASH_GROUP_BITS,
hprefix, hprefix_bits,
- used, num_used, num_found, check, private_data);
+ used, num_used, num_found, check, data);
}
static int off_cmp(const tdb_off_t *a, const tdb_off_t *b)
size_t *num_found,
enum TDB_ERROR (*check)(TDB_DATA,
TDB_DATA, void *),
- void *private_data)
+ void *data)
{
unsigned int g, b;
const tdb_off_t *hash;
+ group_bits
+ TDB_HASH_GROUP_BITS,
used, num_used, num_found,
- check, private_data);
+ check, data);
if (ecode != TDB_SUCCESS) {
goto fail;
}
check:
if (check) {
- TDB_DATA key, data;
- key.dsize = rec_key_length(&rec);
- data.dsize = rec_data_length(&rec);
- key.dptr = (void *)tdb_access_read(tdb,
- off + sizeof(rec),
- key.dsize + data.dsize,
- false);
- if (TDB_PTR_IS_ERR(key.dptr)) {
- ecode = TDB_PTR_ERR(key.dptr);
+ TDB_DATA k, d;
+ const unsigned char *kptr;
+
+ kptr = tdb_access_read(tdb,
+ off + sizeof(rec),
+ rec_key_length(&rec)
+ + rec_data_length(&rec),
+ false);
+ if (TDB_PTR_IS_ERR(kptr)) {
+ ecode = TDB_PTR_ERR(kptr);
goto fail;
}
- data.dptr = key.dptr + key.dsize;
- ecode = check(key, data, private_data);
+
+ k = tdb_mkdata(kptr, rec_key_length(&rec));
+ d = tdb_mkdata(kptr + k.dsize,
+ rec_data_length(&rec));
+ ecode = check(k, d, data);
+ tdb_access_release(tdb, kptr);
if (ecode != TDB_SUCCESS) {
goto fail;
}
- tdb_access_release(tdb, key.dptr);
}
}
}
tdb_off_t used[],
size_t num_used, size_t num_ftables,
int (*check)(TDB_DATA, TDB_DATA, void *),
- void *private_data)
+ void *data)
{
/* Free tables also show up as used. */
size_t num_found = num_ftables;
ecode = check_hash_tree(tdb, offsetof(struct tdb_header, hashtable),
TDB_TOPLEVEL_HASH_BITS-TDB_HASH_GROUP_BITS,
0, 0, used, num_used, &num_found,
- check, private_data);
+ check, data);
if (ecode == TDB_SUCCESS) {
if (num_found != num_used) {
ecode = tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
(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)",
}
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);
if (TDB_OFF_IS_ERR(off)) {
return off;
}
+ if (!first) {
+ off &= TDB_OFF_MASK;
+ first = off;
+ }
ecode = tdb_read_convert(tdb, off, &f, sizeof(f));
if (ecode != TDB_SUCCESS) {
return ecode;
(*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;
}
}
enum TDB_ERROR tdb_check_(struct tdb_context *tdb,
- enum TDB_ERROR (*check)(TDB_DATA key, TDB_DATA data,
- void *private),
- void *private)
+ enum TDB_ERROR (*check)(TDB_DATA, TDB_DATA, void *),
+ void *data)
{
tdb_off_t *fr = NULL, *used = NULL, ft, recovery;
size_t num_free = 0, num_used = 0, num_found = 0, num_ftables = 0;
}
/* FIXME: Check key uniqueness? */
- ecode = check_hash(tdb, used, num_used, num_ftables, check, private);
+ ecode = check_hash(tdb, used, num_used, num_ftables, check, data);
if (ecode != TDB_SUCCESS)
goto out;