Changeset 456 for trunk/server/lib/tdb/common/transaction.c

Timestamp:

Jun 7, 2010, 9:08:40 AM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: changes from 3.3

File:

• trunk/server/lib/tdb/common/transaction.c (modified) (6 diffs)

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

@@ -495 +495 @@
         /* get a read lock from the freelist to the end of file. This
            is upgraded to a write lock during the commit */
+#ifndef __OS2__ // YD the transation lock is an exclusive lock for us, it is enough.
         if (tdb_brlock(tdb, FREELIST_TOP, F_RDLCK, F_SETLKW, 0, 0) == -1) {
                 TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_transaction_start: failed to get hash locks\n"));
@@ -500 +501 @@
                 goto fail;
         }
+#endif
 
         /* setup a copy of the hash table heads so the hash scan in
@@ -531 +533 @@
         
 fail:
+#ifndef __OS2__ // YD the transation lock is an exclusive lock for us, it is enough.
         tdb_brlock(tdb, FREELIST_TOP, F_UNLCK, F_SETLKW, 0, 0);
+#endif
         tdb_transaction_unlock(tdb);
         SAFE_FREE(tdb->transaction->blocks);
@@ -632 +636 @@
         tdb->methods = tdb->transaction->io_methods;
 
+#ifndef __OS2__ // YD the transation lock is an exclusive lock for us, it is enough
         tdb_brlock(tdb, FREELIST_TOP, F_UNLCK, F_SETLKW, 0, 0);
+#endif
         tdb_transaction_unlock(tdb);
         SAFE_FREE(tdb->transaction->hash_heads);
@@ -940 +946 @@
 
         /* upgrade the main transaction lock region to a write lock */
+#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_prepare_commit: failed to upgrade hash locks\n"));
@@ -946 +953 @@
                 return -1;
         }
+#endif
 
         /* get the global lock - this prevents new users attaching to the database