X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Fprivate.h;h=306cb3ff467f70397fbcd91709a285c34e9e9de8;hb=66ead2bcb732aa53bde5092b34c16d780df779ea;hp=1309ce16c0a14c79bc67ee2192696dc4033b0c80;hpb=156e5eb92f1d986957cb081b58320579c6e366dd;p=ccan

diff --git a/ccan/tdb2/private.h b/ccan/tdb2/private.h
index 1309ce16..306cb3ff 100644
--- a/ccan/tdb2/private.h
+++ b/ccan/tdb2/private.h
@@ -367,8 +367,8 @@ struct tdb_context {
 	/* Logging function */
 	void (*log_fn)(struct tdb_context *tdb,
 		       enum tdb_log_level level,
-		       void *data,
-		       const char *message);
+		       const char *message,
+		       void *data);
 	void *log_data;
 
 	/* Hash function. */
@@ -376,6 +376,11 @@ struct tdb_context {
 	void *hash_data;
 	uint64_t hash_seed;
 
+	/* low level (fnctl) lock functions. */
+	int (*lock_fn)(int fd, int rw, off_t off, off_t len, bool w, void *);
+	int (*unlock_fn)(int fd, int rw, off_t off, off_t len, void *);
+	void *lock_data;
+
 	/* Set if we are in a transaction. */
 	struct tdb_transaction *transaction;
 	
@@ -412,8 +417,6 @@ struct tdb_methods {
   internal prototypes
 */
 /* hash.c: */
-void tdb_hash_init(struct tdb_context *tdb);
-
 tdb_bool_err first_in_hash(struct tdb_context *tdb,
 			   struct traverse_info *tinfo,
 			   TDB_DATA *kbuf, size_t *dlen);
@@ -584,6 +587,10 @@ bool tdb_has_expansion_lock(struct tdb_context *tdb);
 /* If it needs recovery, grab all the locks and do it. */
 enum TDB_ERROR tdb_lock_and_recover(struct tdb_context *tdb);
 
+/* Default lock and unlock functions. */
+int tdb_fcntl_lock(int fd, int rw, off_t off, off_t len, bool waitflag, void *);
+int tdb_fcntl_unlock(int fd, int rw, off_t off, off_t len, void *);
+
 /* transaction.c: */
 enum TDB_ERROR tdb_transaction_recover(struct tdb_context *tdb);
 tdb_bool_err tdb_needs_recovery(struct tdb_context *tdb);