Changeset 830

Timestamp:

Nov 13, 2013, 4:36:13 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.6: changed locking code

File:

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

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

@@ -258 +258 @@
 #ifdef __OS2__
         int rc = 0;
-        if (off == FREELIST_TOP && len == 0) { //unlock complete tdb file 
+        rc = fcntl_lock(tdb, F_UNLCK, off, len, 1);
+        // if the first unlock doesn't work and it's a complete unlock,
+        // we split it in 2 parts. first hash size*4 and then the rest
+        // as it was locked that way as well. and it seems fcntl() doesn't care
+        if (rc != 0 && off == FREELIST_TOP && len == 0) { 
                 rc = fcntl_lock(tdb, F_UNLCK, off, tdb->header.hash_size *4, 1);
                 if (rc == 0)
                         rc = fcntl_lock(tdb, F_UNLCK, (off + tdb->header.hash_size *4), len, 1);
-        } else {
-                rc = fcntl_lock(tdb, F_UNLCK, off, len, 1);
         }
         return rc;