From: Howard Chu <hyc@symas.com>
Date: Wed, 16 Jul 2014 16:24:45 +0000 (-0700)
Subject: Free write mutex earlier in txn_reset0
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f6add293a726aec3de809142e5fdaf836843eed9;p=openldap

Free write mutex earlier in txn_reset0
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 70c4de263a..b36f3b1281 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -2798,12 +2798,26 @@ mdb_txn_reset0(MDB_txn *txn, const char *act)
 		txn->mt_numdbs = 0;		/* close nothing if called again */
 		txn->mt_dbxs = NULL;	/* mark txn as reset */
 	} else {
+		pgno_t *pghead = env->me_pghead;
+		env->me_pghead = NULL;
+		env->me_pglast = 0;
+
+		if (!txn->mt_parent) {
+			if (mdb_midl_shrink(&txn->mt_free_pgs))
+				env->me_free_pgs = txn->mt_free_pgs;
+
+			env->me_txn = NULL;
+			/* The writer mutex was locked in mdb_txn_begin. */
+			if (env->me_txns)
+				UNLOCK_MUTEX(MDB_MUTEX(env, w));
+		}
+
 		mdb_cursors_close(txn, 0);
 
 		if (!(env->me_flags & MDB_WRITEMAP)) {
 			mdb_dlist_free(txn);
 		}
-		mdb_midl_free(env->me_pghead);
+		mdb_midl_free(pghead);
 
 		if (txn->mt_parent) {
 			txn->mt_parent->mt_child = NULL;
@@ -2811,18 +2825,7 @@ mdb_txn_reset0(MDB_txn *txn, const char *act)
 			mdb_midl_free(txn->mt_free_pgs);
 			mdb_midl_free(txn->mt_spill_pgs);
 			free(txn->mt_u.dirty_list);
-			return;
 		}
-
-		if (mdb_midl_shrink(&txn->mt_free_pgs))
-			env->me_free_pgs = txn->mt_free_pgs;
-		env->me_pghead = NULL;
-		env->me_pglast = 0;
-
-		env->me_txn = NULL;
-		/* The writer mutex was locked in mdb_txn_begin. */
-		if (env->me_txns)
-			UNLOCK_MUTEX(MDB_MUTEX(env, w));
 	}
 }