From: Hallvard Furuseth <h.b.furuseth@usit.uio.no>
Date: Sun, 20 Jul 2014 14:42:04 +0000 (+0200)
Subject: MDB_ROBUST: Use MDB_PID_T. Drop a wmutex variable.
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ec6cf4e40fb6565a3717e6eb2a4febe143e663d0;p=openldap

MDB_ROBUST: Use MDB_PID_T. Drop a wmutex variable.
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index b36f3b1281..cc15a1bfd1 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -2550,8 +2550,7 @@ mdb_txn_renew0(MDB_txn *txn)
 		}
 	} else {
 		if (ti) {
-			mdb_mutex_t wmutex = MDB_MUTEX(env, w);
-			if (LOCK_MUTEX(rc, env, wmutex))
+			if (LOCK_MUTEX(rc, env, MDB_MUTEX(env, w)))
 				return rc;
 
 			txn->mt_txnid = ti->mti_txnid;
@@ -9418,7 +9417,7 @@ static int mdb_reader_check0(MDB_env *env, int rlocked, int *dead)
 	mdb_mutex_t rmutex = rlocked ? NULL : MDB_MUTEX(env, r);
 	unsigned int i, j, rdrs;
 	MDB_reader *mr;
-	pid_t *pids, pid;
+	MDB_PID_T *pids, pid;
 	int rc = MDB_SUCCESS, count = 0;
 
 	rdrs = env->me_txns->mti_numreaders;