diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-01-18 17:05:17 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-01-18 17:05:17 +1100 |
| commit | 130db062bf53cff39fd2d5ac4d5766dc0a98663e (patch) | |
| tree | 5165b525cc3d0927dcd816c9c91b444984bb429a /source4/lib/tdb/common/tdb_private.h | |
| parent | 391f089d71b4b51a130819ab681dcd1253f16b8c (diff) | |
| parent | 61a015a786c52008f4471e62750ad93507bce518 (diff) | |
| download | samba-130db062bf53cff39fd2d5ac4d5766dc0a98663e.tar.gz samba-130db062bf53cff39fd2d5ac4d5766dc0a98663e.tar.bz2 samba-130db062bf53cff39fd2d5ac4d5766dc0a98663e.zip | |
Merge commit 'origin/v4-0-test' into 4-0-local
(This used to be commit 51422414bed28f425197519298c6b04a9f4e2c4e)
Diffstat (limited to 'source4/lib/tdb/common/tdb_private.h')
| -rw-r--r-- | source4/lib/tdb/common/tdb_private.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/lib/tdb/common/tdb_private.h b/source4/lib/tdb/common/tdb_private.h index 63a6d04e72..ffac89ff0e 100644 --- a/source4/lib/tdb/common/tdb_private.h +++ b/source4/lib/tdb/common/tdb_private.h @@ -49,7 +49,6 @@ typedef uint32_t tdb_off_t; #define TDB_DEAD_MAGIC (0xFEE1DEAD) #define TDB_RECOVERY_MAGIC (0xf53bc0e7U) #define TDB_ALIGNMENT 4 -#define MIN_REC_SIZE (2*sizeof(struct list_struct) + TDB_ALIGNMENT) #define DEFAULT_HASH_SIZE 131 #define FREELIST_TOP (sizeof(struct tdb_header)) #define TDB_ALIGN(x,a) (((x) + (a)-1) & ~((a)-1)) @@ -178,6 +177,7 @@ struct tdb_context { int tdb_munmap(struct tdb_context *tdb); void tdb_mmap(struct tdb_context *tdb); int tdb_lock(struct tdb_context *tdb, int list, int ltype); +int tdb_lock_nonblock(struct tdb_context *tdb, int list, int ltype); int tdb_unlock(struct tdb_context *tdb, int list, int ltype); int tdb_brlock(struct tdb_context *tdb, tdb_off_t offset, int rw_type, int lck_type, int probe, size_t len); int tdb_transaction_lock(struct tdb_context *tdb, int ltype); |