Changeset 94

Show
Ignore:
Timestamp:
10/01/07 00:44:41 (14 months ago)
Author:
psmedley
Message:

TDB fixes

Location:
trunk/samba/source/lib/tdb/common
Files:
2 modified

Legend:

Unmodified
Added
Removed

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

    r90 r94  
    362362         * do with disk files, and resume here by releasing their 
    363363         * global lock and hooking into the active list. */ 
     364#ifndef __OS2__ 
    364365        if (tdb->methods->tdb_brlock(tdb, GLOBAL_LOCK, F_UNLCK, F_SETLKW, 0, 1) == -1) 
    365366                goto fail; 
     367#endif 
    366368        tdb->next = tdbs; 
    367369        tdbs = tdb; 
    … …  
    475477                return 0; /* Nothing to do. */ 
    476478        } 
     479 
    477480#ifdef __OS2__ 
    478  
    479481        DosCloseMutexSem( tdb->hGlobalLock); 
    480482        tdb->hGlobalLock = 0; 

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

    r81 r94  
    533533        tdb->methods = tdb->transaction->io_methods; 
    534534 
    535 #ifndef __OS2__ // YD the transaction lock is an exclusive lock for us, it is enough. 
     535#ifndef __OS2__ // YD the global lock is an exclusive lock for us, it is enough. 
    536536        tdb_brlock(tdb, FREELIST_TOP, F_UNLCK, F_SETLKW, 0, 0); 
    537537#endif 
    … …  
    823823 
    824824        /* upgrade the main transaction lock region to a write lock */ 
    825 #ifndef __OS2__ // YD the transaction lock is an exclusive lock for us, it is enough. 
     825#ifndef __OS2__ // YD the global lock is an exclusive lock for us, it is enough. 
    826826        if (tdb_brlock_upgrade(tdb, FREELIST_TOP, 0) == -1) { 
    827827                TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_transaction_start: failed to upgrade hash locks\n"));