Changeset 836 for branches/samba-3.5.x/lib/tdb/common/transaction.c

Timestamp:

Nov 25, 2013, 6:40:10 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5: use fcntl and friends for locking

File:

• branches/samba-3.5.x/lib/tdb/common/transaction.c (modified) (6 diffs)

branches/samba-3.5.x/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"));
@@ -501 +500 @@
                 goto fail;
         }
-#endif
 
         /* setup a copy of the hash table heads so the hash scan in
@@ -533 +531 @@
         
 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);
@@ -636 +632 @@
         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);
@@ -946 +940 @@
 
         /* 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"));
@@ -953 +946 @@
                 return -1;
         }
-#endif
 
         /* get the global lock - this prevents new users attaching to the database