diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:41:13 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:41:13 +0930 |
| commit | f7e84f8ef86c3323f70e2fa30fd8a49cab1febf9 (patch) | |
| tree | 580a9c1302b332602263b7f1192ea5ee61d43521 /lib/tdb2/tdb1_lock.c | |
| parent | b4a5c6dcb6c60a32b92772396dadfffa6b721732 (diff) | |
| download | samba-f7e84f8ef86c3323f70e2fa30fd8a49cab1febf9.tar.gz samba-f7e84f8ef86c3323f70e2fa30fd8a49cab1febf9.tar.bz2 samba-f7e84f8ef86c3323f70e2fa30fd8a49cab1febf9.zip | |
tdb2: Make TDB1 use the same tdb_hash() wrapper as TDB2
This means converting the tdb1 inbuilt hash functions to the
tdb2-style, so they return 64 bit. We truncate to 32 bit everywhere
but in tdb_check() which needs to do so explicitly.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit 3e46dde21261966941469a6c75e1b45cd2d26324)
Diffstat (limited to 'lib/tdb2/tdb1_lock.c')
| -rw-r--r-- | lib/tdb2/tdb1_lock.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/tdb2/tdb1_lock.c b/lib/tdb2/tdb1_lock.c index 6498b71367..65fa1c123c 100644 --- a/lib/tdb2/tdb1_lock.c +++ b/lib/tdb2/tdb1_lock.c @@ -392,25 +392,30 @@ int tdb1_unlockall_read(struct tdb1_context *tdb) contention - it cannot guarantee how many records will be locked */ int tdb1_chainlock(struct tdb1_context *tdb, TDB_DATA key) { - int ret = tdb1_lock(tdb, TDB1_BUCKET(tdb->hash_fn(&key)), F_WRLCK); + int ret = tdb1_lock(tdb, + TDB1_BUCKET(tdb_hash(tdb, key.dptr, key.dsize)), + F_WRLCK); return ret; } int tdb1_chainunlock(struct tdb1_context *tdb, TDB_DATA key) { - return tdb1_unlock(tdb, TDB1_BUCKET(tdb->hash_fn(&key)), F_WRLCK); + return tdb1_unlock(tdb, TDB1_BUCKET(tdb_hash(tdb, key.dptr, key.dsize)), + F_WRLCK); } int tdb1_chainlock_read(struct tdb1_context *tdb, TDB_DATA key) { int ret; - ret = tdb1_lock(tdb, TDB1_BUCKET(tdb->hash_fn(&key)), F_RDLCK); + ret = tdb1_lock(tdb, TDB1_BUCKET(tdb_hash(tdb, key.dptr, key.dsize)), + F_RDLCK); return ret; } int tdb1_chainunlock_read(struct tdb1_context *tdb, TDB_DATA key) { - return tdb1_unlock(tdb, TDB1_BUCKET(tdb->hash_fn(&key)), F_RDLCK); + return tdb1_unlock(tdb, TDB1_BUCKET(tdb_hash(tdb, key.dptr, key.dsize)), + F_RDLCK); } /* record lock stops delete underneath */ |