tdb2: don't cancel transaction when tdb_transaction_prepare_commit fails

[ccan] / ccan / tdb2 / lock.c

diff --git a/ccan/tdb2/lock.c b/ccan/tdb2/lock.c
index 5b04c0d243d9b29f2a5104af3f7836a5a47e8f40..8bd9c4f0f4bca5c9a5079a74120919a1ae73c3d5 100644 (file)
--- a/ccan/tdb2/lock.c
+++ b/ccan/tdb2/lock.c
@@ -555,23 +555,14 @@ again:
        /* Lock hashes, gradually. */
        ecode = tdb_lock_gradual(tdb, ltype, flags, TDB_HASH_LOCK_START,
                                 TDB_HASH_LOCK_RANGE);
-       if (ecode != TDB_SUCCESS) {
-               if (!(flags & TDB_LOCK_PROBE)) {
-                       tdb_logerr(tdb, ecode, TDB_LOG_ERROR,
-                                  "tdb_allrecord_lock hashes failed");
-               }
+       if (ecode != TDB_SUCCESS)
                return ecode;
-       }
 
        /* Lock free tables: there to end of file. */
        ecode = tdb_brlock(tdb, ltype,
                           TDB_HASH_LOCK_START + TDB_HASH_LOCK_RANGE,
                           0, flags);
        if (ecode != TDB_SUCCESS) {
-               if (!(flags & TDB_LOCK_PROBE)) {
-                       tdb_logerr(tdb, ecode, TDB_LOG_ERROR,
-                                "tdb_allrecord_lock freetables failed");
-               }
                tdb_brunlock(tdb, ltype, TDB_HASH_LOCK_START,
                             TDB_HASH_LOCK_RANGE);
                return ecode;