From f0d790f1304cf66b679e0c7ee92bc52933b562b8 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 22 Feb 2010 15:03:23 +1030 Subject: [PATCH] tdb: cleanup: remove ltype argument from _tdb_transaction_cancel. Now the transaction allrecord lock the standard one, and thus is cleaned in tdb_release_extra_locks(), _tdb_transaction_cancel() doesn't need to know what type it is. Signed-off-by: Rusty Russell --- ccan/tdb/tdb_private.h | 1 - ccan/tdb/transaction.c | 29 +++++++++++++---------------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/ccan/tdb/tdb_private.h b/ccan/tdb/tdb_private.h index 52383287..82e2ac9b 100644 --- a/ccan/tdb/tdb_private.h +++ b/ccan/tdb/tdb_private.h @@ -284,7 +284,6 @@ int tdb_ofs_read(struct tdb_context *tdb, tdb_off_t offset, tdb_off_t *d); int tdb_ofs_write(struct tdb_context *tdb, tdb_off_t offset, tdb_off_t *d); int tdb_lock_record(struct tdb_context *tdb, tdb_off_t off); int tdb_unlock_record(struct tdb_context *tdb, tdb_off_t off); -int _tdb_transaction_cancel(struct tdb_context *tdb, int ltype); int tdb_rec_read(struct tdb_context *tdb, tdb_off_t offset, struct tdb_record *rec); int tdb_rec_write(struct tdb_context *tdb, tdb_off_t offset, struct tdb_record *rec); int tdb_do_delete(struct tdb_context *tdb, tdb_off_t rec_ptr, struct tdb_record *rec); diff --git a/ccan/tdb/transaction.c b/ccan/tdb/transaction.c index a6cffb35..fc0ca1d9 100644 --- a/ccan/tdb/transaction.c +++ b/ccan/tdb/transaction.c @@ -466,8 +466,8 @@ static int transaction_sync(struct tdb_context *tdb, tdb_off_t offset, tdb_len_t return 0; } -/* ltype is F_WRLCK after prepare. */ -int _tdb_transaction_cancel(struct tdb_context *tdb, int ltype) + +static int _tdb_transaction_cancel(struct tdb_context *tdb) { int i, ret = 0; @@ -632,11 +632,8 @@ fail_allrecord_lock: */ int tdb_transaction_cancel(struct tdb_context *tdb) { - int ltype = F_RDLCK; tdb_trace(tdb, "tdb_transaction_cancel"); - if (tdb->transaction && tdb->transaction->prepared) - ltype = F_WRLCK; - return _tdb_transaction_cancel(tdb, ltype); + return _tdb_transaction_cancel(tdb); } /* @@ -896,14 +893,14 @@ static int _tdb_transaction_prepare_commit(struct tdb_context *tdb) if (tdb->transaction->prepared) { tdb->ecode = TDB_ERR_EINVAL; - _tdb_transaction_cancel(tdb, F_WRLCK); + _tdb_transaction_cancel(tdb); TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_transaction_prepare_commit: transaction already prepared\n")); return -1; } if (tdb->transaction->transaction_error) { tdb->ecode = TDB_ERR_IO; - _tdb_transaction_cancel(tdb, F_RDLCK); + _tdb_transaction_cancel(tdb); TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_transaction_prepare_commit: transaction error pending\n")); return -1; } @@ -926,14 +923,14 @@ static int _tdb_transaction_prepare_commit(struct tdb_context *tdb) if (tdb_have_extra_locks(tdb)) { tdb->ecode = TDB_ERR_LOCK; TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_transaction_prepare_commit: locks pending on commit\n")); - _tdb_transaction_cancel(tdb, F_RDLCK); + _tdb_transaction_cancel(tdb); return -1; } /* upgrade the main transaction lock region to a write lock */ if (tdb_allrecord_upgrade(tdb) == -1) { TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_transaction_prepare_commit: failed to upgrade hash locks\n")); - _tdb_transaction_cancel(tdb, F_RDLCK); + _tdb_transaction_cancel(tdb); return -1; } @@ -941,7 +938,7 @@ static int _tdb_transaction_prepare_commit(struct tdb_context *tdb) during the commit */ if (tdb_nest_lock(tdb, OPEN_LOCK, F_WRLCK, TDB_LOCK_WAIT) == -1) { TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_transaction_prepare_commit: failed to get open lock\n")); - _tdb_transaction_cancel(tdb, F_WRLCK); + _tdb_transaction_cancel(tdb); return -1; } @@ -949,7 +946,7 @@ static int _tdb_transaction_prepare_commit(struct tdb_context *tdb) /* write the recovery data to the end of the file */ if (transaction_setup_recovery(tdb, &tdb->transaction->magic_offset) == -1) { TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_transaction_prepare_commit: failed to setup recovery data\n")); - _tdb_transaction_cancel(tdb, F_WRLCK); + _tdb_transaction_cancel(tdb); return -1; } } @@ -963,7 +960,7 @@ static int _tdb_transaction_prepare_commit(struct tdb_context *tdb) tdb->transaction->old_map_size) == -1) { tdb->ecode = TDB_ERR_IO; TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_transaction_prepare_commit: expansion failed\n")); - _tdb_transaction_cancel(tdb, F_WRLCK); + _tdb_transaction_cancel(tdb); return -1; } tdb->map_size = tdb->transaction->old_map_size; @@ -1015,7 +1012,7 @@ int tdb_transaction_commit(struct tdb_context *tdb) /* check for a null transaction */ if (tdb->transaction->blocks == NULL) { - _tdb_transaction_cancel(tdb, F_RDLCK); + _tdb_transaction_cancel(tdb); return 0; } @@ -1051,7 +1048,7 @@ int tdb_transaction_commit(struct tdb_context *tdb) tdb->methods = methods; tdb_transaction_recover(tdb); - _tdb_transaction_cancel(tdb, F_WRLCK); + _tdb_transaction_cancel(tdb); TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_transaction_commit: write failed\n")); return -1; @@ -1086,7 +1083,7 @@ int tdb_transaction_commit(struct tdb_context *tdb) /* use a transaction cancel to free memory and remove the transaction locks */ - _tdb_transaction_cancel(tdb, F_WRLCK); + _tdb_transaction_cancel(tdb); if (need_repack) { return tdb_repack(tdb); -- 2.39.2