X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Fprivate.h;h=3904442574a34b66d58bac1871e8d860ad18f2aa;hb=6b7c3c840eafbec211b9f58751c5ff754302a68e;hp=3397e04c4c4391d43bbab3e401e5a3bd0de57acf;hpb=736c033322079baf754261d82b6a83de53b2bb4e;p=ccan

diff --git a/ccan/tdb2/private.h b/ccan/tdb2/private.h
index 3397e04c..39044425 100644
--- a/ccan/tdb2/private.h
+++ b/ccan/tdb2/private.h
@@ -77,10 +77,10 @@ typedef int tdb_bool_err;
 
 /* Prevent others from opening the file. */
 #define TDB_OPEN_LOCK 0
-/* Doing a transaction. */
-#define TDB_TRANSACTION_LOCK 1
 /* Expanding file. */
 #define TDB_EXPANSION_LOCK 2
+/* Doing a transaction. */
+#define TDB_TRANSACTION_LOCK 8
 /* Hash chain locks. */
 #define TDB_HASH_LOCK_START 64
 
@@ -334,8 +334,8 @@ struct tdb_context {
 	/* Operating read-only? (Opened O_RDONLY, or in traverse_read) */
 	bool read_only;
 
-	/* mmap read only? */
-	int mmap_flags;
+	/* Open flags passed to tdb_open. */
+	int open_flags;
 
 	/* the flags passed to tdb_open, for tdb_reopen. */
 	uint32_t flags;
@@ -343,6 +343,7 @@ struct tdb_context {
 	/* Logging function */
 	void (*log_fn)(struct tdb_context *tdb,
 		       enum tdb_log_level level,
+		       enum TDB_ERROR ecode,
 		       const char *message,
 		       void *data);
 	void *log_data;