Commit 3b6a181e authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

Remove unneeded boi_locker field

parent 118efc4e
......@@ -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;
......
......@@ -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 */
......
......@@ -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;
......
......@@ -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) {
......
......@@ -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;
......
......@@ -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;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment