TDB2: remove TDB1 compatibility.

[metze/samba/wip.git] / lib / tdb2 / hash.c

diff --git a/lib/tdb2/hash.c b/lib/tdb2/hash.c
index 0d4d7805ce575c5c023246fa3cbaadc64d526fa1..067884a74eb50f004107be4ad20f3ec770ea93b8 100644 (file)
--- a/lib/tdb2/hash.c
+++ b/lib/tdb2/hash.c
@@ -853,11 +853,6 @@ static enum TDB_ERROR chainlock(struct tdb_context *tdb, const TDB_DATA *key,
    contention - it cannot guarantee how many records will be locked */
 _PUBLIC_ enum TDB_ERROR tdb_chainlock(struct tdb_context *tdb, TDB_DATA key)
 {
-       if (tdb->flags & TDB_VERSION1) {
-               if (tdb1_chainlock(tdb, key) == -1)
-                       return tdb->last_error;
-               return TDB_SUCCESS;
-       }
        return tdb->last_error = chainlock(tdb, &key, F_WRLCK, TDB_LOCK_WAIT,
                                           "tdb_chainlock");
 }
@@ -868,11 +863,6 @@ _PUBLIC_ void tdb_chainunlock(struct tdb_context *tdb, TDB_DATA key)
        tdb_off_t lockstart, locksize;
        unsigned int group, gbits;
 
-       if (tdb->flags & TDB_VERSION1) {
-               tdb1_chainunlock(tdb, key);
-               return;
-       }
-
        gbits = TDB_TOPLEVEL_HASH_BITS - TDB_HASH_GROUP_BITS;
        group = bits_from(h, 64 - gbits, gbits);
 
@@ -884,11 +874,6 @@ _PUBLIC_ void tdb_chainunlock(struct tdb_context *tdb, TDB_DATA key)
 
 _PUBLIC_ enum TDB_ERROR tdb_chainlock_read(struct tdb_context *tdb, TDB_DATA key)
 {
-       if (tdb->flags & TDB_VERSION1) {
-               if (tdb1_chainlock_read(tdb, key) == -1)
-                       return tdb->last_error;
-               return TDB_SUCCESS;
-       }
        return tdb->last_error = chainlock(tdb, &key, F_RDLCK, TDB_LOCK_WAIT,
                                           "tdb_chainlock_read");
 }
@@ -899,10 +884,6 @@ _PUBLIC_ void tdb_chainunlock_read(struct tdb_context *tdb, TDB_DATA key)
        tdb_off_t lockstart, locksize;
        unsigned int group, gbits;
 
-       if (tdb->flags & TDB_VERSION1) {
-               tdb1_chainunlock_read(tdb, key);
-               return;
-       }
        gbits = TDB_TOPLEVEL_HASH_BITS - TDB_HASH_GROUP_BITS;
        group = bits_from(h, 64 - gbits, gbits);