X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Fprivate.h;h=c95c7e05e59181f9d67c8131c7d813353a4c99af;hp=030b46ca38a2fbe1e4b751ebe7717133d98a37d3;hb=e37b906781eeddb89d2ba6c5c39e9d20e4111c18;hpb=8d8de08d9079f503256e1682dfa93bb22dcd4ad0

diff --git a/ccan/tdb2/private.h b/ccan/tdb2/private.h
index 030b46ca..c95c7e05 100644
--- a/ccan/tdb2/private.h
+++ b/ccan/tdb2/private.h
@@ -75,7 +75,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))
 
@@ -335,6 +335,7 @@ struct tdb_file {
 	int fd;
 
 	/* Lock information */
+	pid_t locker;
 	struct tdb_lock allrecord_lock;
 	size_t num_lockrecs;
 	struct tdb_lock *lockrecs;
@@ -390,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;
 };
@@ -546,7 +550,7 @@ enum TDB_ERROR tdb_unlock_hashes(struct tdb_context *tdb,
 				 tdb_len_t hash_range, int ltype);
 
 /* For closing the file. */
-void tdb_unlock_all(struct tdb_context *tdb);
+void tdb_lock_cleanup(struct tdb_context *tdb);
 
 /* Lock/unlock a particular free bucket. */
 enum TDB_ERROR tdb_lock_free_bucket(struct tdb_context *tdb, tdb_off_t b_off,