tdb2: move mmap into struct tdb_file

[ccan] / ccan / tdb2 / lock.c

diff --git a/ccan/tdb2/lock.c b/ccan/tdb2/lock.c
index 98570d7627e7a38272c4f72ebcf60edece5dadfd..19da88e2c02a0e3cf96b39d951b211e31e57bc75 100644 (file)
--- a/ccan/tdb2/lock.c
+++ b/ccan/tdb2/lock.c
@@ -279,7 +279,8 @@ static enum TDB_ERROR tdb_nest_lock(struct tdb_context *tdb,
        struct tdb_lock_type *new_lck;
        enum TDB_ERROR ecode;
 
-       if (offset > TDB_HASH_LOCK_START + TDB_HASH_LOCK_RANGE + tdb->map_size / 8) {
+       if (offset > (TDB_HASH_LOCK_START + TDB_HASH_LOCK_RANGE
+                     + tdb->file->map_size / 8)) {
                return tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_ERROR,
                                  "tdb_nest_lock: invalid offset %zu ltype=%d",
                                  (size_t)offset, ltype);
@@ -574,7 +575,7 @@ void tdb_allrecord_unlock(struct tdb_context *tdb, int ltype)
            && (!tdb->file->allrecord_lock.off || ltype != F_RDLCK)) {
                tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_ERROR,
                           "tdb_allrecord_unlock: have %s lock",
-                          tdb->allrecord_lock.ltype == F_RDLCK
+                          tdb->file->allrecord_lock.ltype == F_RDLCK
                           ? "read" : "write");
                return;
        }