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

Timestamp:

Mar 18, 2014, 4:51:05 PM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.6: remove mutex sem and do it with a filelock

File:

• trunk/server/lib/tdb/common/io.c (modified) (1 diff)

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

@@ -98 +98 @@
         // is a write lock: do not wait for lock.
         // so this is what we try here:
-        // 1. add a write lock and see if it works
+        // 1. add a write lock and see it it works
         // 2. if the write lock wasn't set, we try to unlock the segment
-        //    first and add the write lock afterwards 
+        //    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 
         int upgradeLockRC = 0;
+        int unlockRC = -1;
         upgradeLockRC = tdb_brlock(tdb, F_WRLCK, off, len, TDB_LOCK_NOWAIT);
         if (upgradeLockRC != 0) {
-                tdb_brunlock(tdb, F_RDLCK, off, len);
+                unlockRC = tdb_brunlock(tdb, F_RDLCK, off, len);
                 upgradeLockRC = tdb_brlock(tdb, F_WRLCK, off, len, TDB_LOCK_NOWAIT);
         }