From 3b6a181e533702bd602c8e9efca8236638fccc79 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Sat, 9 Feb 2008 02:13:16 +0000 Subject: [PATCH] Remove unneeded boi_locker field --- servers/slapd/back-bdb/add.c | 1 - servers/slapd/back-bdb/back-bdb.h | 1 - servers/slapd/back-bdb/delete.c | 1 - servers/slapd/back-bdb/id2entry.c | 3 +-- servers/slapd/back-bdb/modify.c | 1 - servers/slapd/back-bdb/modrdn.c | 1 - 6 files changed, 1 insertion(+), 7 deletions(-) diff --git a/servers/slapd/back-bdb/add.c b/servers/slapd/back-bdb/add.c index b9d5dea250..2e966d3525 100644 --- a/servers/slapd/back-bdb/add.c +++ b/servers/slapd/back-bdb/add.c @@ -174,7 +174,6 @@ retry: /* transaction retry */ opinfo.boi_bdb = op->o_bd; opinfo.boi_txn = ltid; - opinfo.boi_locker = locker; opinfo.boi_err = 0; opinfo.boi_acl_cache = op->o_do_not_cache; op->o_private = &opinfo; diff --git a/servers/slapd/back-bdb/back-bdb.h b/servers/slapd/back-bdb/back-bdb.h index 90c119c3e4..9991662dfc 100644 --- a/servers/slapd/back-bdb/back-bdb.h +++ b/servers/slapd/back-bdb/back-bdb.h @@ -269,7 +269,6 @@ struct bdb_lock_info { struct bdb_op_info { BackendDB* boi_bdb; DB_TXN* boi_txn; - BDB_LOCKER boi_locker; u_int32_t boi_err; int boi_acl_cache; struct bdb_lock_info *boi_locks; /* used when no txn */ diff --git a/servers/slapd/back-bdb/delete.c b/servers/slapd/back-bdb/delete.c index 2e711cc846..25a9e18d4d 100644 --- a/servers/slapd/back-bdb/delete.c +++ b/servers/slapd/back-bdb/delete.c @@ -157,7 +157,6 @@ retry: /* transaction retry */ opinfo.boi_bdb = op->o_bd; opinfo.boi_txn = ltid; - opinfo.boi_locker = locker; opinfo.boi_err = 0; opinfo.boi_acl_cache = op->o_do_not_cache; op->o_private = &opinfo; diff --git a/servers/slapd/back-bdb/id2entry.c b/servers/slapd/back-bdb/id2entry.c index 98c75bb9fa..14efa8b900 100644 --- a/servers/slapd/back-bdb/id2entry.c +++ b/servers/slapd/back-bdb/id2entry.c @@ -331,12 +331,11 @@ int bdb_entry_get( if( op ) boi = (struct bdb_op_info *) op->o_private; if( boi != NULL && op->o_bd->be_private == boi->boi_bdb->be_private ) { txn = boi->boi_txn; - locker = boi->boi_locker; } if ( txn != NULL ) { locker = TXN_ID ( txn ); - } else if ( !locker ) { + } else { rc = LOCK_ID ( bdb->bi_dbenv, &locker ); free_lock_id = 1; switch(rc) { diff --git a/servers/slapd/back-bdb/modify.c b/servers/slapd/back-bdb/modify.c index 942774a665..f20812ac0f 100644 --- a/servers/slapd/back-bdb/modify.c +++ b/servers/slapd/back-bdb/modify.c @@ -441,7 +441,6 @@ retry: /* transaction retry */ opinfo.boi_bdb = op->o_bd; opinfo.boi_txn = ltid; - opinfo.boi_locker = locker; opinfo.boi_err = 0; opinfo.boi_acl_cache = op->o_do_not_cache; op->o_private = &opinfo; diff --git a/servers/slapd/back-bdb/modrdn.c b/servers/slapd/back-bdb/modrdn.c index 9fa9f33d62..c5bd76f136 100644 --- a/servers/slapd/back-bdb/modrdn.c +++ b/servers/slapd/back-bdb/modrdn.c @@ -167,7 +167,6 @@ retry: /* transaction retry */ opinfo.boi_bdb = op->o_bd; opinfo.boi_txn = ltid; - opinfo.boi_locker = locker; opinfo.boi_err = 0; opinfo.boi_acl_cache = op->o_do_not_cache; op->o_private = &opinfo; -- 2.39.5