From 56055f788cd9cec0256e79d0db0b53885d7a18b0 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 4 Jun 2013 12:29:32 +0200 Subject: Revert "dbwrap: dbwrap_fetch_locked_timeout()." This reverts commit f6eb187fdab6b8088bb065e418fe604c4eba7751. Signed-off-by: Volker Lendecke Reviewed-by: Rusty Russell Autobuild-User(master): Volker Lendecke Autobuild-Date(master): Thu Jun 6 14:26:26 CEST 2013 on sn-devel-104 --- lib/dbwrap/dbwrap_tdb.c | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'lib/dbwrap/dbwrap_tdb.c') diff --git a/lib/dbwrap/dbwrap_tdb.c b/lib/dbwrap/dbwrap_tdb.c index b62dcdf418..3f21192233 100644 --- a/lib/dbwrap/dbwrap_tdb.c +++ b/lib/dbwrap/dbwrap_tdb.c @@ -159,21 +159,6 @@ static struct db_record *db_tdb_fetch_locked( return db_tdb_fetch_locked_internal(db, mem_ctx, key); } -static struct db_record *db_tdb_fetch_locked_timeout( - struct db_context *db, TALLOC_CTX *mem_ctx, TDB_DATA key, - unsigned int timeout) -{ - struct db_tdb_ctx *ctx = talloc_get_type_abort(db->private_data, - struct db_tdb_ctx); - - db_tdb_log_key("Locking with timeout ", key); - if (tdb_chainlock_with_timeout(ctx->wtdb->tdb, key, timeout) != 0) { - DEBUG(3, ("tdb_chainlock_with_timeout failed\n")); - return NULL; - } - return db_tdb_fetch_locked_internal(db, mem_ctx, key); -} - static struct db_record *db_tdb_try_fetch_locked( struct db_context *db, TALLOC_CTX *mem_ctx, TDB_DATA key) { @@ -458,7 +443,6 @@ struct db_context *db_open_tdb(TALLOC_CTX *mem_ctx, db_tdb->id.ino = st.st_ino; result->fetch_locked = db_tdb_fetch_locked; - result->fetch_locked_timeout = db_tdb_fetch_locked_timeout; result->try_fetch_locked = db_tdb_try_fetch_locked; result->traverse = db_tdb_traverse; result->traverse_read = db_tdb_traverse_read; -- cgit