Changeset 44 for trunk/samba/source/tdb/common/traverse.c

Timestamp:

Jun 29, 2007, 1:34:14 PM (18 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.25b

File:

• trunk/samba/source/tdb/common/traverse.c (modified) (6 diffs)

trunk/samba/source/tdb/common/traverse.c

@@ -264 +264 @@
         tdb->travlocks.lock_rw = F_RDLCK;
 
+        /* Grab first record: locks chain and returned record. */
         if (tdb_next_lock(tdb, &tdb->travlocks, &rec) <= 0)
                 return tdb_null;
@@ -269 +270 @@
         key.dsize = rec.key_len;
         key.dptr =tdb_alloc_read(tdb,tdb->travlocks.off+sizeof(rec),key.dsize);
-        if (tdb_unlock(tdb, BUCKET(tdb->travlocks.hash), F_WRLCK) != 0)
+
+        /* Unlock the hash chain of the record we just read. */
+        if (tdb_unlock(tdb, tdb->travlocks.hash, tdb->travlocks.lock_rw) != 0)
                 TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_firstkey: error occurred while tdb_unlocking!\n"));
         return key;
@@ -284 +287 @@
         /* Is locked key the old key?  If so, traverse will be reliable. */
         if (tdb->travlocks.off) {
-                if (tdb_lock(tdb,tdb->travlocks.hash,F_WRLCK))
+                if (tdb_lock(tdb,tdb->travlocks.hash,tdb->travlocks.lock_rw))
                         return tdb_null;
                 if (tdb_rec_read(tdb, tdb->travlocks.off, &rec) == -1
@@ -295 +298 @@
                                 return tdb_null;
                         }
-                        if (tdb_unlock(tdb, tdb->travlocks.hash, F_WRLCK) != 0) {
+                        if (tdb_unlock(tdb, tdb->travlocks.hash, tdb->travlocks.lock_rw) != 0) {
                                 SAFE_FREE(k);
                                 return tdb_null;
@@ -307 +310 @@
         if (!tdb->travlocks.off) {
                 /* No previous element: do normal find, and lock record */
-                tdb->travlocks.off = tdb_find_lock_hash(tdb, oldkey, tdb->hash_fn(&oldkey), F_WRLCK, &rec);
+                tdb->travlocks.off = tdb_find_lock_hash(tdb, oldkey, tdb->hash_fn(&oldkey), tdb->travlocks.lock_rw, &rec);
                 if (!tdb->travlocks.off)
                         return tdb_null;
@@ -325 +328 @@
                                           key.dsize);
                 /* Unlock the chain of this new record */
-                if (tdb_unlock(tdb, tdb->travlocks.hash, F_WRLCK) != 0)
+                if (tdb_unlock(tdb, tdb->travlocks.hash, tdb->travlocks.lock_rw) != 0)
                         TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_nextkey: WARNING tdb_unlock failed!\n"));
         }
         /* Unlock the chain of old record */
-        if (tdb_unlock(tdb, BUCKET(oldhash), F_WRLCK) != 0)
+        if (tdb_unlock(tdb, BUCKET(oldhash), tdb->travlocks.lock_rw) != 0)
                 TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_nextkey: WARNING tdb_unlock failed!\n"));
         return key;
 }
-