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

Timestamp:

May 4, 2015, 7:21:36 PM (10 years ago)

Author:

Silvan Scherrer

Message:

Samba server 3.6: fixed some tdb problems

File:

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

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

@@ -41 +41 @@
         fl.l_whence = SEEK_SET;
         fl.l_start = off;
-#ifdef __OS2__
-        fl.l_len = len ? len:LONG_MAX;
-#else
         fl.l_len = len;
-#endif
         fl.l_pid = 0;
 
@@ -71 +67 @@
                 if (rc == 0) {
                         fl.l_start = off + tdb->header.hash_size * 4;
-                        fl.l_len = LONG_MAX;
+                        fl.l_len = 0;
                         rc = fcntl(lockFile, cmd, &fl);
                 }
         }
 
-        TDB_LOG((tdb, TDB_DEBUG_TRACE,"fcntl_lock: (fd=%d) offset=%lld rw_type=%d len=%lld waitflag=%d (rc=%d)\n",
-                lockFile, off, rw, len, waitflag, rc));
+        TDB_LOG((tdb, TDB_DEBUG_TRACE,"fcntl_lock: (fd=%d) offset=%lld rw_type=%d len=%lld waitflag=%d (rc=%d) pid=%d\n",
+                lockFile, off, rw, len, waitflag, rc, getpid()));
 
         return rc;
@@ -152 +148 @@
         fl.l_whence = SEEK_SET;
         fl.l_start = off;
-#ifdef __OS2__
-        fl.l_len = len ? len:LONG_MAX;
-#else
         fl.l_len = len;
-#endif
         fl.l_pid = 0;
 
@@ -176 +168 @@
                 if (rc == 0) {
                         fl.l_start = off + tdb->header.hash_size * 4;
-                        fl.l_len = LONG_MAX;
+                        fl.l_len = 0;
                         rc = fcntl(lockFile, F_SETLKW, &fl);
                 }
         }
 
-        TDB_LOG((tdb, TDB_DEBUG_TRACE,"fcntl_unlock: (fd=%d) offset=%lld rw_type=%d len=%lld (rc=%d)\n",
-                 lockFile, off, rw, len, rc));
+        TDB_LOG((tdb, TDB_DEBUG_TRACE,"fcntl_unlock: (fd=%d) offset=%lld rw_type=%d len=%lld (rc=%d) pid=%d\n",
+                 lockFile, off, rw, len, rc, getpid()));
 
         return rc;