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

Timestamp:

Nov 12, 2013, 7:56:26 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.6: small code cleanup

File:

• trunk/server/lib/tdb/common/lock.c (modified) (4 diffs)

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

@@ -123 +123 @@
         APIRET      rc;
         ULONG       fAccess = 0; // default exclusiv
-        FILELOCK    lockArea = {0}, unlockArea = {0}, unlockArea1 = {0};
+        FILELOCK    lockArea = {0}, unlockArea = {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",
@@ -140 +140 @@
                 case F_UNLCK:
                         unlockArea.lOffset = off;
-                        unlockArea.lRange  = len ? len : tdb->header.hash_size *4; //was LONG_MAX
-                        unlockArea1.lOffset = off;
-                        unlockArea1.lRange  = len ? len : LONG_MAX;
+                        unlockArea.lRange  = len ? len : LONG_MAX
                         break;
                 case F_RDLCK:
@@ -157 +155 @@
         }
                 
-// 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) {
@@ -167 +161 @@
                 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);