X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb%2Fopen.c;h=54a8fe57ad11a460471785dbf370f7ae1f4a9b93;hp=64782df7fc016963a3d22dee884ce3b937a972f6;hb=e9989ef0758b3b660abf444d014c5b51a3a7c1b4;hpb=d6b6780d0bc3dbdaaf679bbc308f74042f933cfd

diff --git a/ccan/tdb/open.c b/ccan/tdb/open.c
index 64782df7..54a8fe57 100644
--- a/ccan/tdb/open.c
+++ b/ccan/tdb/open.c
@@ -240,8 +240,8 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
         fcntl(tdb->fd, F_SETFD, v | FD_CLOEXEC);
 
 	/* ensure there is only one process initialising at once */
-	if (tdb->methods->brlock(tdb, F_WRLCK, GLOBAL_LOCK, 1, TDB_LOCK_WAIT) == -1) {
-		TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_open_ex: failed to get global lock on %s: %s\n",
+	if (tdb_nest_lock(tdb, OPEN_LOCK, F_WRLCK, TDB_LOCK_WAIT) == -1) {
+		TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_open_ex: failed to get open lock on %s: %s\n",
 			 name, strerror(errno)));
 		goto fail;	/* errno set by tdb_brlock */
 	}
@@ -355,9 +355,10 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
  internal:
 	/* Internal (memory-only) databases skip all the code above to
 	 * do with disk files, and resume here by releasing their
-	 * global lock and hooking into the active list. */
-	if (tdb->methods->brunlock(tdb, F_WRLCK, GLOBAL_LOCK, 1) == -1)
+	 * open lock and hooking into the active list. */
+	if (tdb_nest_unlock(tdb, OPEN_LOCK, F_WRLCK, false) == -1) {
 		goto fail;
+	}
 	tdb->next = tdbs;
 	tdbs = tdb;
 	return tdb;
@@ -461,7 +462,7 @@ static int tdb_reopen_internal(struct tdb_context *tdb, bool active_lock)
 		return 0; /* Nothing to do. */
 	}
 
-	if (tdb->num_locks != 0 || tdb->global_lock.count) {
+	if (tdb_have_extra_locks(tdb)) {
 		TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_reopen: reopen not allowed with locks held\n"));
 		goto fail;
 	}