Changeset 878 for trunk/server/lib/tdb/common/io.c

Timestamp:

May 4, 2015, 7:21:36 PM (10 years ago)

Author:

Silvan Scherrer

Message:

Samba server 3.6: fixed some tdb problems

File:

• trunk/server/lib/tdb/common/io.c (modified) (3 diffs)

trunk/server/lib/tdb/common/io.c

@@ -102 +102 @@
         //    first and add the write lock afterwards
         // 3. we remove the write lock further down 
-        // 4. we might add the removed lock from step #2 again 
+        // 4. we add the removed lock from step #2 again 
         int upgradeLockRC = 0;
         int unlockRC = -1;
         upgradeLockRC = tdb_brlock(tdb, F_WRLCK, off, len, TDB_LOCK_NOWAIT);
         if (upgradeLockRC != 0) {
-                unlockRC = tdb_brunlock(tdb, F_RDLCK, off, len);
+                unlockRC = tdb_brunlock(tdb, F_RDLCK, off, 1);
                 upgradeLockRC = tdb_brlock(tdb, F_WRLCK, off, len, TDB_LOCK_NOWAIT);
         }
@@ -144 +144 @@
                         if (upgradeLockRC == 0)
                                 tdb_brunlock( tdb, F_WRLCK, off, len);
+                        if (unlockRC == 0)
+                                tdb_brlock( tdb, F_RDLCK, off, 1, TDB_LOCK_WAIT);
 #endif
                         return -1;
@@ -151 +153 @@
         if (upgradeLockRC == 0)
                 tdb_brunlock( tdb, F_WRLCK, off, len);
+        if (unlockRC == 0)
+                tdb_brlock( tdb, F_RDLCK, off, 1, TDB_LOCK_WAIT);
 #endif
         return 0;