Changeset 878

Timestamp:

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

Author:

Silvan Scherrer

Message:

Samba server 3.6: fixed some tdb problems

Location:

trunk/server/lib/tdb

Files:

• common/io.c (modified) (3 diffs)
• common/lock.c (modified) (4 diffs)
• tools/tdbtorture.c (modified) (1 diff)

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

@@ -102 +102 @@
         //    first and add the write lock afterwards
         // 3. we remove the write lock further down 
-        // 4. we might add the removed lock from step #2 again 
+        // 4. we add the removed lock from step #2 again 
         int upgradeLockRC = 0;
         int unlockRC = -1;
         upgradeLockRC = tdb_brlock(tdb, F_WRLCK, off, len, TDB_LOCK_NOWAIT);
         if (upgradeLockRC != 0) {
-                unlockRC = tdb_brunlock(tdb, F_RDLCK, off, len);
+                unlockRC = tdb_brunlock(tdb, F_RDLCK, off, 1);
                 upgradeLockRC = tdb_brlock(tdb, F_WRLCK, off, len, TDB_LOCK_NOWAIT);
         }
@@ -144 +144 @@
                         if (upgradeLockRC == 0)
                                 tdb_brunlock( tdb, F_WRLCK, off, len);
+                        if (unlockRC == 0)
+                                tdb_brlock( tdb, F_RDLCK, off, 1, TDB_LOCK_WAIT);
 #endif
                         return -1;
@@ -151 +153 @@
         if (upgradeLockRC == 0)
                 tdb_brunlock( tdb, F_WRLCK, off, len);
+        if (unlockRC == 0)
+                tdb_brlock( tdb, F_RDLCK, off, 1, TDB_LOCK_WAIT);
 #endif
         return 0;

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;

trunk/server/lib/tdb/tools/tdbtorture.c

@@ -249 +249 @@
 
         for (;loopnum<num_loops && error_count == 0;loopnum++) {
+                printf("loop %i\n", loopnum);
                 addrec_db();
         }