Remove unnneded boi_locker field

diff --git a/servers/slapd/back-bdb/add.c b/servers/slapd/back-bdb/add.c
index b9d5dea2509ab215fb634d4ff70e224b3d0c75a1..2e966d3525e9cffe890aa9fd902166f6c42cd915 100644 (file)
--- 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 90c119c3e48c8914dfe1f416162bacfd0abc5882..9991662dfcb71a2745c41b6e44593d9cca4704fa 100644 (file)
--- 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 2e711cc846e02aeffb4818073eab5ce15e745067..25a9e18d4dea0e0c636d7e72252e1b897eb95a0d 100644 (file)
--- 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 98c75bb9fa952e6b69ca561d72b4b2edf30c8c9f..14efa8b9001db10f5363cc56b50503397a8e8de5 100644 (file)
--- 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 942774a6657c5521d85d627aa251bdd19f8039b1..f20812ac0f948a49f62c0625b4723fe155133989 100644 (file)
--- 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 9fa9f33d62949dadb0a037866ebef33efef51ec2..c5bd76f1367f97f7afb958120dd4ff7c813f9ba2 100644 (file)
--- 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;