diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:56:13 +0930 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:56:13 +0930 |
commit | 9140fca812063be69842a6c64030e32c65c9dff1 (patch) | |
tree | 73b9e12160be66ce7853e0e9b44ad44c17269b65 /lib/tdb2/tdb1_lock.c | |
parent | 30294c7b91456dd49b89a9b26eb0b1066087815c (diff) | |
download | samba-9140fca812063be69842a6c64030e32c65c9dff1.tar.gz samba-9140fca812063be69842a6c64030e32c65c9dff1.tar.bz2 samba-9140fca812063be69842a6c64030e32c65c9dff1.zip |
tdb2: unify tdb1_chainlock et al. into tdb_chainlock
Switch on the TDB_VERSION1 flag.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit ceb2f3eacbad917ee990afbc3dd800bfb0607887)
Diffstat (limited to 'lib/tdb2/tdb1_lock.c')
-rw-r--r-- | lib/tdb2/tdb1_lock.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/lib/tdb2/tdb1_lock.c b/lib/tdb2/tdb1_lock.c index 7cc17d7a7e..f21a22cacd 100644 --- a/lib/tdb2/tdb1_lock.c +++ b/lib/tdb2/tdb1_lock.c @@ -306,7 +306,7 @@ int tdb1_allrecord_lock(struct tdb_context *tdb, int ltype, } /* FIXME: Temporary cast. */ - tdb->file->allrecord_lock.owner = (void *)(struct tdb1_context *)tdb; + tdb->file->allrecord_lock.owner = (void *)(struct tdb_context *)tdb; tdb->file->allrecord_lock.count = 1; /* If it's upgradable, it's actually exclusive so we can treat * it as a write lock. */ @@ -364,30 +364,6 @@ int tdb1_allrecord_unlock(struct tdb_context *tdb, int ltype) return 0; } -/* lock entire database with write lock */ -int tdb1_lockall(struct tdb_context *tdb) -{ - return tdb1_allrecord_lock(tdb, F_WRLCK, TDB_LOCK_WAIT, false); -} - -/* unlock entire database with write lock */ -int tdb1_unlockall(struct tdb_context *tdb) -{ - return tdb1_allrecord_unlock(tdb, F_WRLCK); -} - -/* lock entire database with read lock */ -int tdb1_lockall_read(struct tdb_context *tdb) -{ - return tdb1_allrecord_lock(tdb, F_RDLCK, TDB_LOCK_WAIT, false); -} - -/* unlock entire database with read lock */ -int tdb1_unlockall_read(struct tdb_context *tdb) -{ - return tdb1_allrecord_unlock(tdb, F_RDLCK); -} - /* lock/unlock one hash chain. This is meant to be used to reduce contention - it cannot guarantee how many records will be locked */ int tdb1_chainlock(struct tdb_context *tdb, TDB_DATA key) |