diff options
| author | Volker Lendecke <vl@samba.org> | 2013-06-04 12:29:32 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2013-06-06 14:26:26 +0200 |
| commit | 56055f788cd9cec0256e79d0db0b53885d7a18b0 (patch) | |
| tree | 19845483ce9d3f506a4f54dfd4823dce751ba5c1 /lib/dbwrap/dbwrap_tdb.c | |
| parent | a8b0fba9fb6da247c355b3d4303604ae6a675a9c (diff) | |
| download | samba-56055f788cd9cec0256e79d0db0b53885d7a18b0.tar.gz samba-56055f788cd9cec0256e79d0db0b53885d7a18b0.tar.bz2 samba-56055f788cd9cec0256e79d0db0b53885d7a18b0.zip | |
Revert "dbwrap: dbwrap_fetch_locked_timeout()."
This reverts commit f6eb187fdab6b8088bb065e418fe604c4eba7751.
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Rusty Russell <rusty@rustcorp.com.au>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Thu Jun 6 14:26:26 CEST 2013 on sn-devel-104
Diffstat (limited to 'lib/dbwrap/dbwrap_tdb.c')
| -rw-r--r-- | lib/dbwrap/dbwrap_tdb.c | 16 |
1 files changed, 0 insertions, 16 deletions
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; |