From: Hallvard Furuseth <hallvard@openldap.org>
Date: Sat, 4 Jul 2015 11:48:04 +0000 (+0200)
Subject: Simpler mdb_txn_commit().
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=084d412f9b6d89806cd8dbbaa0b2d3a59470dc45;p=openldap

Simpler mdb_txn_commit().

mt_env is always set.
Commit(mt_child) resets mt_child, so parent need not.
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index b5db13bac5..00a6d07dc9 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -3349,12 +3349,11 @@ mdb_txn_commit(MDB_txn *txn)
 	unsigned int i;
 	MDB_env	*env;
 
-	if (txn == NULL || txn->mt_env == NULL)
+	if (txn == NULL)
 		return EINVAL;
 
 	if (txn->mt_child) {
 		rc = mdb_txn_commit(txn->mt_child);
-		txn->mt_child = NULL;
 		if (rc)
 			goto fail;
 	}