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

Timestamp:

Nov 25, 2013, 4:35:16 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.6: use fcntl and friends for locking

File:

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

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

@@ -94 +94 @@
         // 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_brunlock( tdb, F_RDLCK, off, len);
         // 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, F_WRLCK, off, len, F_SETLK);
+        int upgradeLockRC = tdb_brlock( tdb, F_WRLCK, off, len, F_SETLK);
+        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
-
         if (tdb->map_ptr) {
                 memcpy(off + (char *)tdb->map_ptr, buf, len);
@@ -127 +127 @@
                                  "write %d bytes at %d in two attempts\n",
                                  len, off));
-#ifdef __OS2__ // remove our lock
-                        tdb_brunlock( tdb, F_WRLCK, off, len);
+#ifdef __OS2__ // remove our lock, if upgrade succeded
+                        if (upgradeLockRC == 0)
+                                tdb_brunlock( tdb, F_WRLCK, off, len);
 #endif
                         return -1;
                 }
         }
-#ifdef __OS2__ // remove our lock
-                        tdb_brunlock( tdb, F_WRLCK, off, len);
+#ifdef __OS2__ // remove our lock, if upgrade succeded
+        if (upgradeLockRC == 0)
+                tdb_brunlock( tdb, F_WRLCK, off, len);
 #endif
         return 0;