Changeset 752 for trunk/server/lib/tdb/common/lock.c

Timestamp:

Nov 29, 2012, 2:06:31 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9 2nd part

Location:

trunk/server

Files:

• . (modified) (1 prop)
• lib/tdb/common/lock.c (modified) (6 diffs)

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

@@ -103 +103 @@
 
         errno = EINVAL;
-        TDB_LOG(( tdb, TDB_DEBUG_ERROR, "_mutex_brlock pid %X, failed (fd=%d) at offset %d rw_type=%d lck_type=%d len=%d, rc=%d\n", 
+        TDB_LOG(( tdb, TDB_DEBUG_ERROR, "_mutex_brlock pid %d, failed (fd=%d) at offset %d rw_type=%d lck_type=%d len=%d, rc=%d\n", 
                  getpid(), tdb->fd, offset, rw_type, waitflag, (int)len, rc));
         tdb->ecode = TDB_ERR_LOCK;
@@ -125 +125 @@
         off_t       offStart;
         off_t       cbRange;
-        FILELOCK    lockArea = {0}, unlockArea = {0};
-
-        TDB_LOG((tdb, TDB_DEBUG_TRACE, "fcntl_lock in pid %X, fd %d, lck_type %s, rw_type %s, offset %d, len %d\n",
+        FILELOCK    lockArea = {0}, unlockArea = {0}, unlockArea1 = {0};
+
+        TDB_LOG((tdb, TDB_DEBUG_TRACE, "fcntl_lock in pid %d, fd %d, lck_type %s, rw_type %s, offset %d, len %d\n",
                 getpid(), tdb->fd, lock_type(waitflag), read_type(rw), off, len));
         
@@ -144 +144 @@
                         unlockArea.lOffset = off;
                         unlockArea.lRange  = len ? len : tdb->header.hash_size *4; //was LONG_MAX
+                        unlockArea1.lOffset = off;
+                        unlockArea1.lRange  = len ? len : LONG_MAX;
                         break;
                 case F_RDLCK:
@@ -158 +160 @@
         }
                 
+// why DosSetFileLocks() in the F_UNLCK case with len == 0, fails is really a question
+// to overcome that i do 2 unlock with 2 different length (nasty workaround imho)
         rc = DosSetFileLocks(tdb->fd, &unlockArea, &lockArea, SEM_IMMEDIATE_RETURN, fAccess);
+        if (rc != NO_ERROR && rw == F_UNLCK && len == 0)
+        rc = DosSetFileLocks(tdb->fd, &unlockArea1, &lockArea, SEM_IMMEDIATE_RETURN, fAccess);
 
         if (rc != NO_ERROR && waitflag) {
@@ -164 +170 @@
                 do {
                         rc = DosSetFileLocks(tdb->fd, &unlockArea, &lockArea, 100, fAccess);
+                        if (rc != NO_ERROR && rw == F_UNLCK && len == 0)
+                        rc = DosSetFileLocks(tdb->fd, &unlockArea1, &lockArea, 100, fAccess);
                         count--;
                 } while( count>0 && rc !=NO_ERROR);
@@ -169 +177 @@
         }
 
-        TDB_LOG(( tdb, TDB_DEBUG_TRACE, "fcntl_lock out pid %X, fd %d, lck_type %s, rw_type %s, offset %d, len %d, rc=%d\n",
+        TDB_LOG(( tdb, TDB_DEBUG_TRACE, "fcntl_lock out pid %d, fd %d, lck_type %s, rw_type %s, offset %d, len %d, rc=%d\n",
                 getpid(), tdb->fd, lock_type(waitflag), read_type(rw), off, len, rc));