X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb%2Flock.c;h=4f8970fd34bc4e7766e2748e2bbf077ad76a5f97;hp=66cfcbdeea6eab9cd943f7b18a9dd8f66e4c9f8e;hb=d92b8a7d9a050eb9735e48a8d37a5833500242d3;hpb=57c618f35d2aa244d444670c63a21e7a677c63c2

diff --git a/ccan/tdb/lock.c b/ccan/tdb/lock.c
index 66cfcbde..4f8970fd 100644
--- a/ccan/tdb/lock.c
+++ b/ccan/tdb/lock.c
@@ -474,8 +474,8 @@ static int _tdb_lockall(struct tdb_context *tdb, int ltype,
 		tdb->ecode = TDB_ERR_LOCK;
 		return -1;
 	}
-	
-	if (tdb->num_locks != 0) {
+
+	if (tdb_have_extra_locks(tdb)) {
 		/* can't combine global and chain locks */
 		tdb->ecode = TDB_ERR_LOCK;
 		return -1;
@@ -691,3 +691,14 @@ int tdb_unlock_record(struct tdb_context *tdb, tdb_off_t off)
 			count++;
 	return (count == 1 ? tdb->methods->brunlock(tdb, F_RDLCK, off, 1) : 0);
 }
+
+bool tdb_have_extra_locks(struct tdb_context *tdb)
+{
+	if (tdb->allrecord_lock.count) {
+		return true;
+	}
+	if (tdb->num_lockrecs) {
+		return true;
+	}
+	return false;
+}