Changeset 862 for trunk/server/lib/tdb/common

Timestamp:

May 13, 2014, 11:39:04 AM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

• . (modified) (1 prop)
• lib/tdb/common/lock.c (modified) (4 diffs)
• lib/tdb/common/open.c (modified) (2 diffs)

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

@@ -52 +52 @@
         int lockFile = 0;
 
-        if (off == ACTIVE_LOCK)
+        if (off == ACTIVE_LOCK || off == OPEN_LOCK || off == TRANSACTION_LOCK)
                 lockFile = tdb->hActiveLock;
         else
@@ -77 +77 @@
 
         TDB_LOG((tdb, TDB_DEBUG_TRACE,"fcntl_lock: (fd=%d) offset=%lld rw_type=%d len=%lld waitflag=%d (rc=%d)\n",
-                tdb->fd, off, rw, len, waitflag, rc));
+                lockFile, off, rw, len, waitflag, rc));
 
         return rc;
@@ -162 +162 @@
         int rc = 0;
         int lockFile = 0;
-        if (off == ACTIVE_LOCK)
+        if (off == ACTIVE_LOCK || off == OPEN_LOCK || off == TRANSACTION_LOCK)
                 lockFile = tdb->hActiveLock;
         else
@@ -182 +182 @@
 
         TDB_LOG((tdb, TDB_DEBUG_TRACE,"fcntl_unlock: (fd=%d) offset=%lld rw_type=%d len=%lld (rc=%d)\n",
-                 tdb->fd, off, rw, len, rc));
+                 lockFile, off, rw, len, rc));
 
         return rc;

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

@@ -303 +303 @@
         fcntl(tdb->fd, F_SETFD, v | FD_CLOEXEC);
 
+#ifdef __OS2__
+        if (os2_crtActiveLock(tdb, name, 1, mode) != 0)
+                goto fail;
+#endif
+
         /* ensure there is only one process initialising at once */
         if (tdb_nest_lock(tdb, OPEN_LOCK, F_WRLCK, TDB_LOCK_WAIT) == -1) {
@@ -309 +314 @@
                 goto fail;      /* errno set by tdb_brlock */
         }
-
-#ifdef __OS2__
-        if (os2_crtActiveLock(tdb, name, 1, mode) != 0)
-                goto fail;
-#endif
 
         /* we need to zero database if we are the only one with it open */