Changeset 836 for branches/samba-3.5.x/lib/tdb/common/io.c

Timestamp:

Nov 25, 2013, 6:40:10 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5: use fcntl and friends for locking

File:

• branches/samba-3.5.x/lib/tdb/common/io.c (modified) (3 diffs)

branches/samba-3.5.x/lib/tdb/common/io.c

@@ -93 +93 @@
         // YD we must upgrade read locks to write locks (exclusive), otherwise
         // the owner (us) is not allowed to write to the file (different from unix)
-        TDB_LOG((tdb, TDB_DEBUG_TRACE,"unlocking at %d len=%d before writing.\n", off, len));
-        tdb_brlock( tdb, off, F_UNLCK, F_SETLK, 0, 1);
         // if a wider previous lock is in effect, we cannot write lock our segment
         // (e.g. a lock_upgrade locks all the file), so we hope the previous lock 
         // is a write lock: do not wait for lock.
-        tdb_brlock( tdb, off, F_WRLCK, F_SETLK, 0, len);
+        int upgradeLockRC = tdb_brlock( tdb, off, F_WRLCK, F_SETLK, 0, len);
+        TDB_LOG((tdb, TDB_DEBUG_TRACE,"upgrading lock at %d len=%d "
+                "before writing %s (rc=%d).\n", off, len,
+                 upgradeLockRC ? "was successfull":"failed", upgradeLockRC));
 #endif
 
@@ -127 +128 @@
                                  len, off));
 
-#ifdef __OS2__ // remove our lock
-                        tdb_brlock( tdb, off, F_UNLCK, F_SETLK, 0, len);
+#ifdef __OS2__ // remove our lock, if upgrade succeded
+                        if (upgradeLockRC == 0)
+                                tdb_brlock( tdb, off, F_UNLCK, F_SETLK, 0, len);
 #endif
                         return -1;
@@ -134 +136 @@
         }
 
-#ifdef __OS2__ // remove our lock
-        tdb_brlock( tdb, off, F_UNLCK, F_SETLK, 0, len);
+#ifdef __OS2__ // remove our lock, if upgrade succeded
+                        if (upgradeLockRC == 0)
+                                tdb_brlock( tdb, off, F_UNLCK, F_SETLK, 0, len);
 #endif