From cbad6e2c140e59a6ec653bcfe773599a57a5042f Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 14 Sep 2011 07:49:13 +0930 Subject: tdb2: unify tdb1_open into tdb_open Finally, we gut tdb1_open() to the tdb1-specific parts, and call it from tdb_open if they specify the TDB_VERSION1 flag or the version is a TDB1. We also unify tdb_close(), based on the TDB_VERSION1 flag. Note that tdb_open(TDB_VERSION1) will fail on an existing tdb if it's a TDB2. Signed-off-by: Rusty Russell (Imported from CCAN commit c8c3b3568677e8b0105f84e4ab068c580faf4591) --- lib/tdb2/lock.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib/tdb2/lock.c') diff --git a/lib/tdb2/lock.c b/lib/tdb2/lock.c index 173130b2d5..bd896a35e0 100644 --- a/lib/tdb2/lock.c +++ b/lib/tdb2/lock.c @@ -862,7 +862,12 @@ void tdb_lock_cleanup(struct tdb_context *tdb) while (tdb->file->allrecord_lock.count && tdb->file->allrecord_lock.owner == tdb) { - tdb_allrecord_unlock(tdb, tdb->file->allrecord_lock.ltype); + if (tdb->flags & TDB_VERSION1) + tdb1_allrecord_unlock(tdb, + tdb->file->allrecord_lock.ltype); + else + tdb_allrecord_unlock(tdb, + tdb->file->allrecord_lock.ltype); } for (i=0; ifile->num_lockrecs; i++) { -- cgit