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

Timestamp:

Nov 25, 2013, 4:35:16 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.6: use fcntl and friends for locking

File:

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

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

@@ -486 +486 @@
         /* 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_allrecord_lock(tdb, F_RDLCK, TDB_LOCK_WAIT, true) == -1) {
                 TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_transaction_start: failed to get hash locks\n"));
                 goto fail_allrecord_lock;
         }
-#endif
 
         /* setup a copy of the hash table heads so the hash scan in
@@ -523 +521 @@
 
 fail:
-#ifndef __OS2__ // YD the transation lock is an exclusive lock for us, it is enough.
         tdb_allrecord_unlock(tdb, F_RDLCK, false);
-#endif
 fail_allrecord_lock:
         tdb_transaction_unlock(tdb, F_WRLCK);
@@ -949 +945 @@
 
         /* 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_allrecord_upgrade(tdb) == -1) {
                 TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_transaction_prepare_commit: failed to upgrade hash locks\n"));
@@ -955 +950 @@
                 return -1;
         }
-#endif
 
         /* get the open lock - this prevents new users attaching to the database