Changeset 94

Timestamp:

Oct 1, 2007, 12:44:41 AM (18 years ago)

Author:

Paul Smedley

Message:

TDB fixes

Location:

trunk/samba/source/lib/tdb/common

Files:

• open.c (modified) (2 diffs)
• transaction.c (modified) (2 diffs)

trunk/samba/source/lib/tdb/common/open.c

@@ -362 +362 @@
          * do with disk files, and resume here by releasing their
          * global lock and hooking into the active list. */
+#ifndef __OS2__
         if (tdb->methods->tdb_brlock(tdb, GLOBAL_LOCK, F_UNLCK, F_SETLKW, 0, 1) == -1)
                 goto fail;
+#endif
         tdb->next = tdbs;
         tdbs = tdb;
@@ -475 +477 @@
                 return 0; /* Nothing to do. */
         }
+
 #ifdef __OS2__
-
         DosCloseMutexSem( tdb->hGlobalLock);
         tdb->hGlobalLock = 0;

trunk/samba/source/lib/tdb/common/transaction.c

@@ -533 +533 @@
         tdb->methods = tdb->transaction->io_methods;
 
-#ifndef __OS2__ // YD the transaction lock is an exclusive lock for us, it is enough.
+#ifndef __OS2__ // YD the global lock is an exclusive lock for us, it is enough.
         tdb_brlock(tdb, FREELIST_TOP, F_UNLCK, F_SETLKW, 0, 0);
 #endif
@@ -823 +823 @@
 
         /* upgrade the main transaction lock region to a write lock */
-#ifndef __OS2__ // YD the transaction lock is an exclusive lock for us, it is enough.
+#ifndef __OS2__ // YD the global lock is an exclusive lock for us, it is enough.
         if (tdb_brlock_upgrade(tdb, FREELIST_TOP, 0) == -1) {
                 TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_transaction_start: failed to upgrade hash locks\n"));