diff options
| author | Volker Lendecke <vl@samba.org> | 2020-12-21 14:40:47 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2021-06-04 16:47:34 +0000 |
| commit | a41af25ebd424184ceb300a181cbfca7a9eb014c (patch) | |
| tree | 8b56c6c6cadfeee094d2f447b937822be3991d14 /lib/dbwrap | |
| parent | 8089f5190cb17d519f2dee27a74eccb5b8560e8a (diff) | |
| download | samba-a41af25ebd424184ceb300a181cbfca7a9eb014c.tar.gz | |
dbwrap: Remove "db_context->try_fetch_locked()" fn pointer
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'lib/dbwrap')
| -rw-r--r-- | lib/dbwrap/dbwrap_private.h | 3 | ||||
| -rw-r--r-- | lib/dbwrap/dbwrap_tdb.c | 15 |
2 files changed, 0 insertions, 18 deletions
diff --git a/lib/dbwrap/dbwrap_private.h b/lib/dbwrap/dbwrap_private.h index 8a1f03c7bec..3ac5ebf97a1 100644 --- a/lib/dbwrap/dbwrap_private.h +++ b/lib/dbwrap/dbwrap_private.h @@ -40,9 +40,6 @@ struct db_context { struct db_record *(*fetch_locked)(struct db_context *db, TALLOC_CTX *mem_ctx, TDB_DATA key); - struct db_record *(*try_fetch_locked)(struct db_context *db, - TALLOC_CTX *mem_ctx, - TDB_DATA key); int (*traverse)(struct db_context *db, int (*f)(struct db_record *rec, void *private_data), diff --git a/lib/dbwrap/dbwrap_tdb.c b/lib/dbwrap/dbwrap_tdb.c index 74b895a7736..6cd95fa25ad 100644 --- a/lib/dbwrap/dbwrap_tdb.c +++ b/lib/dbwrap/dbwrap_tdb.c @@ -169,20 +169,6 @@ static struct db_record *db_tdb_fetch_locked( return db_tdb_fetch_locked_internal(db, ctx, mem_ctx, key); } -static struct db_record *db_tdb_try_fetch_locked( - struct db_context *db, TALLOC_CTX *mem_ctx, TDB_DATA key) -{ - struct db_tdb_ctx *ctx = talloc_get_type_abort(db->private_data, - struct db_tdb_ctx); - - db_tdb_log_key("Trying to lock", key); - if (tdb_chainlock_nonblock(ctx->wtdb->tdb, key) != 0) { - DEBUG(3, ("tdb_chainlock_nonblock failed\n")); - return NULL; - } - return db_tdb_fetch_locked_internal(db, ctx, mem_ctx, key); -} - static NTSTATUS db_tdb_do_locked(struct db_context *db, TDB_DATA key, void (*fn)(struct db_record *rec, TDB_DATA value, @@ -509,7 +495,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->try_fetch_locked = db_tdb_try_fetch_locked; result->do_locked = db_tdb_do_locked; result->traverse = db_tdb_traverse; result->traverse_read = db_tdb_traverse_read; |