diff options
| author | Volker Lendecke <vl@samba.org> | 2013-12-06 11:57:42 +0000 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2013-12-14 10:10:41 +0100 |
| commit | 706c4deca142ce1363da54ab4806337726e6a50c (patch) | |
| tree | e28e58b9c3fd5749844bed9f5278bf7c5427548c /lib/dbwrap | |
| parent | 95bfc1568648d03d5f03ab3f720a961dbc4d6cd5 (diff) | |
| download | samba-706c4deca142ce1363da54ab4806337726e6a50c.tar.gz | |
dbwrap: No lock_order check if not required
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'lib/dbwrap')
| -rw-r--r-- | lib/dbwrap/dbwrap.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/lib/dbwrap/dbwrap.c b/lib/dbwrap/dbwrap.c index 2c633cf159e..8270b63a1a2 100644 --- a/lib/dbwrap/dbwrap.c +++ b/lib/dbwrap/dbwrap.c @@ -167,15 +167,6 @@ static struct dbwrap_lock_order_state *dbwrap_check_lock_order( static struct db_context *locked_dbs[DBWRAP_LOCK_ORDER_MAX]; struct dbwrap_lock_order_state *state = NULL; - if (db->lock_order == 0) { - /* - * lock order 0 is for example for dbwrap_rbt without - * real locking. Return state nevertheless to avoid - * special cases. - */ - return talloc_zero(mem_ctx, struct dbwrap_lock_order_state); - } - if (db->lock_order > DBWRAP_LOCK_ORDER_MAX) { DEBUG(0,("Invalid lock order %d of %s\n", (int)db->lock_order, db->name)); @@ -219,11 +210,13 @@ static struct db_record *dbwrap_fetch_locked_internal( TDB_DATA key)) { struct db_record *rec; - struct dbwrap_lock_order_state *lock_order; + struct dbwrap_lock_order_state *lock_order = NULL; - lock_order = dbwrap_check_lock_order(db, mem_ctx); - if (lock_order == NULL) { - return NULL; + if (db->lock_order != 0) { + lock_order = dbwrap_check_lock_order(db, mem_ctx); + if (lock_order == NULL) { + return NULL; + } } rec = db_fn(db, mem_ctx, key); if (rec == NULL) { |