diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2010-02-05 00:00:24 +1030 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2010-02-10 16:56:13 +1030 |
| commit | 6269cdcd1538e2e3cead9e0f3c156b0363d607a0 (patch) | |
| tree | a2516931487ed0f8dee1379befa3284947769470 /lib/tdb/common | |
| parent | f299fe565ae5dba76ffc708da9a47405d61b0af9 (diff) | |
| download | samba-6269cdcd1538e2e3cead9e0f3c156b0363d607a0.tar.gz samba-6269cdcd1538e2e3cead9e0f3c156b0363d607a0.tar.bz2 samba-6269cdcd1538e2e3cead9e0f3c156b0363d607a0.zip | |
tdb: give a name to the invalid recovery area constant (0)
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'lib/tdb/common')
| -rw-r--r-- | lib/tdb/common/check.c | 2 | ||||
| -rw-r--r-- | lib/tdb/common/tdb_private.h | 1 | ||||
| -rw-r--r-- | lib/tdb/common/transaction.c | 6 |
3 files changed, 5 insertions, 4 deletions
diff --git a/lib/tdb/common/check.c b/lib/tdb/common/check.c index f0a15f801b..6bbfd7d82a 100644 --- a/lib/tdb/common/check.c +++ b/lib/tdb/common/check.c @@ -370,7 +370,7 @@ int tdb_check(struct tdb_context *tdb, goto free; break; case TDB_RECOVERY_MAGIC: - case 0: /* Used for invalid (or in-progress) recovery area. */ + case TDB_RECOVERY_INVALID_MAGIC: if (recovery_start != off) { TDB_LOG((tdb, TDB_DEBUG_ERROR, "Unexpected recovery record at offset %d\n", diff --git a/lib/tdb/common/tdb_private.h b/lib/tdb/common/tdb_private.h index be9be72b15..0e74b103b3 100644 --- a/lib/tdb/common/tdb_private.h +++ b/lib/tdb/common/tdb_private.h @@ -49,6 +49,7 @@ typedef uint32_t tdb_off_t; #define TDB_FREE_MAGIC (~TDB_MAGIC) #define TDB_DEAD_MAGIC (0xFEE1DEAD) #define TDB_RECOVERY_MAGIC (0xf53bc0e7U) +#define TDB_RECOVERY_INVALID_MAGIC (0x0) #define TDB_ALIGNMENT 4 #define DEFAULT_HASH_SIZE 131 #define FREELIST_TOP (sizeof(struct tdb_header)) diff --git a/lib/tdb/common/transaction.c b/lib/tdb/common/transaction.c index b8988ea830..ed7e298a6e 100644 --- a/lib/tdb/common/transaction.c +++ b/lib/tdb/common/transaction.c @@ -596,10 +596,10 @@ int _tdb_transaction_cancel(struct tdb_context *tdb) if (tdb->transaction->magic_offset) { const struct tdb_methods *methods = tdb->transaction->io_methods; - uint32_t zero = 0; + uint32_t invalid = TDB_RECOVERY_INVALID_MAGIC; /* remove the recovery marker */ - if (methods->tdb_write(tdb, tdb->transaction->magic_offset, &zero, 4) == -1 || + if (methods->tdb_write(tdb, tdb->transaction->magic_offset, &invalid, 4) == -1 || transaction_sync(tdb, tdb->transaction->magic_offset, 4) == -1) { TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_transaction_cancel: failed to remove recovery magic\n")); ret = -1; @@ -793,7 +793,7 @@ static int transaction_setup_recovery(struct tdb_context *tdb, rec = (struct tdb_record *)data; memset(rec, 0, sizeof(*rec)); - rec->magic = 0; + rec->magic = TDB_RECOVERY_INVALID_MAGIC; rec->data_len = recovery_size; rec->rec_len = recovery_max_size; rec->key_len = old_map_size; |