X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Fprivate.h;h=1e31ec159fbe457cfd570cdf60d6461d62e52dfa;hb=45e9956d665dc8819eb183ae239581410dcecdb3;hp=4e7fc8ffeccaba5e2ab13348cf02a23bcbbb15bf;hpb=bb4d59ee1e914df9f8066e59a9c9a6604e581c40;p=ccan

diff --git a/ccan/tdb2/private.h b/ccan/tdb2/private.h
index 4e7fc8ff..1e31ec15 100644
--- a/ccan/tdb2/private.h
+++ b/ccan/tdb2/private.h
@@ -35,6 +35,7 @@
 #include <ccan/tdb2/tdb2.h>
 #include <ccan/likely/likely.h>
 #include <ccan/compiler/compiler.h>
+#include <ccan/cast/cast.h>
 #if HAVE_BYTESWAP_H
 #include <byteswap.h>
 #endif
@@ -75,7 +76,7 @@ typedef uint64_t tdb_off_t;
 
 /* Packing errors into pointers and v.v. */
 #define TDB_PTR_IS_ERR(ptr) \
-	unlikely((void *)(ptr) >= (void *)(long)TDB_ERR_LAST)
+	unlikely((unsigned long)(ptr) >= (unsigned long)TDB_ERR_LAST)
 #define TDB_PTR_ERR(p) ((enum TDB_ERROR)(long)(p))
 #define TDB_ERR_PTR(err) ((void *)(long)(err))
 
@@ -246,7 +247,9 @@ struct tdb_header {
 	uint64_t features_used; /* Features all writers understand */
 	uint64_t features_offered; /* Features offered */
 
-	tdb_off_t reserved[24];
+	uint64_t seqnum; /* Sequence number for TDB_SEQNUM */
+
+	tdb_off_t reserved[23];
 
 	/* Top level hash table. */
 	tdb_off_t hashtable[1ULL << TDB_TOPLEVEL_HASH_BITS];
@@ -388,6 +391,9 @@ struct tdb_context {
 	/* Direct access information */
 	struct tdb_access_hdr *access;
 
+	/* Last error we returned. */
+	enum TDB_ERROR last_error;
+
 	/* The actual file information */
 	struct tdb_file *file;
 };
@@ -523,6 +529,9 @@ enum TDB_ERROR tdb_write_convert(struct tdb_context *tdb, tdb_off_t off,
 enum TDB_ERROR tdb_read_convert(struct tdb_context *tdb, tdb_off_t off,
 				void *rec, size_t len);
 
+/* Bump the seqnum (caller checks for tdb->flags & TDB_SEQNUM) */
+void tdb_inc_seqnum(struct tdb_context *tdb);
+
 /* Adds a stat, if it's in range. */
 void add_stat_(struct tdb_context *tdb, uint64_t *stat, size_t val);
 #define add_stat(tdb, statname, val)					\