- /*
+ /*
Unix SMB/CIFS implementation.
trivial database library
fl.l_len = len;
fl.l_pid = 0;
+ add_stat(tdb, lock_lowlevel, 1);
if (waitflag)
return fcntl(tdb->fd, F_SETLKW, &fl);
- else
+ else {
+ add_stat(tdb, lock_nonblock, 1);
return fcntl(tdb->fd, F_SETLK, &fl);
+ }
}
static int fcntl_unlock(struct tdb_context *tdb, int rw, off_t off, off_t len)
}
if (!found) {
- fprintf(stderr, "Unlock on %u@%u not found!\n",
+ fprintf(stderr, "Unlock on %u@%u not found!",
(int)off, (int)len);
abort();
}
note that a len of zero means lock to end of file
*/
-static int tdb_brlock(struct tdb_context *tdb,
- int rw_type, tdb_off_t offset, tdb_off_t len,
- enum tdb_lock_flags flags)
+static enum TDB_ERROR tdb_brlock(struct tdb_context *tdb,
+ int rw_type, tdb_off_t offset, tdb_off_t len,
+ enum tdb_lock_flags flags)
{
int ret;
if (tdb->flags & TDB_NOLOCK) {
- return 0;
+ return TDB_SUCCESS;
}
if (rw_type == F_WRLCK && tdb->read_only) {
- tdb->ecode = TDB_ERR_RDONLY;
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_RDONLY, TDB_LOG_USE_ERROR,
+ "Write lock attempted on read-only database");
}
/* A 32 bit system cannot open a 64-bit file, but it could have
* expanded since then: check here. */
if ((size_t)(offset + len) != offset + len) {
- tdb->ecode = TDB_ERR_IO;
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_brlock: lock on giant offset %llu\n",
- (long long)(offset + len));
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
+ "tdb_brlock: lock on giant offset %llu",
+ (long long)(offset + len));
}
do {
} while (ret == -1 && errno == EINTR);
if (ret == -1) {
- tdb->ecode = TDB_ERR_LOCK;
/* Generic lock error. errno set by fcntl.
* EAGAIN is an expected return from non-blocking
* locks. */
if (!(flags & TDB_LOCK_PROBE) && errno != EAGAIN) {
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_brlock failed (fd=%d) at"
- " offset %llu rw_type=%d flags=%d len=%llu\n",
- tdb->fd, (long long)offset, rw_type,
- flags, (long long)len);
+ tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_ERROR,
+ "tdb_brlock failed (fd=%d) at"
+ " offset %zu rw_type=%d flags=%d len=%zu:"
+ " %s",
+ tdb->fd, (size_t)offset, rw_type,
+ flags, (size_t)len, strerror(errno));
}
- return -1;
+ return TDB_ERR_LOCK;
}
- return 0;
+ return TDB_SUCCESS;
}
-static int tdb_brunlock(struct tdb_context *tdb,
- int rw_type, tdb_off_t offset, size_t len)
+static enum TDB_ERROR tdb_brunlock(struct tdb_context *tdb,
+ int rw_type, tdb_off_t offset, size_t len)
{
int ret;
if (tdb->flags & TDB_NOLOCK) {
- return 0;
+ return TDB_SUCCESS;
}
do {
} while (ret == -1 && errno == EINTR);
if (ret == -1) {
- tdb->log(tdb, TDB_DEBUG_TRACE, tdb->log_priv,
- "tdb_brunlock failed (fd=%d) at offset %llu"
- " rw_type=%d len=%llu\n",
- tdb->fd, (long long)offset, rw_type, (long long)len);
+ return tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_ERROR,
+ "tdb_brunlock failed (fd=%d) at offset %zu"
+ " rw_type=%d len=%zu",
+ tdb->fd, (size_t)offset, rw_type,
+ (size_t)len);
}
- return ret;
+ return TDB_SUCCESS;
}
/*
upgrade a read lock to a write lock. This needs to be handled in a
special way as some OSes (such as solaris) have too conservative
deadlock detection and claim a deadlock when progress can be
- made. For those OSes we may loop for a while.
+ made. For those OSes we may loop for a while.
*/
-int tdb_allrecord_upgrade(struct tdb_context *tdb)
+enum TDB_ERROR tdb_allrecord_upgrade(struct tdb_context *tdb)
{
int count = 1000;
if (tdb->allrecord_lock.count != 1) {
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_allrecord_upgrade failed: count %u too high\n",
- tdb->allrecord_lock.count);
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_ERROR,
+ "tdb_allrecord_upgrade failed:"
+ " count %u too high",
+ tdb->allrecord_lock.count);
}
if (tdb->allrecord_lock.off != 1) {
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_allrecord_upgrade failed: already upgraded?\n");
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_ERROR,
+ "tdb_allrecord_upgrade failed:"
+ " already upgraded?");
}
while (count--) {
struct timeval tv;
if (tdb_brlock(tdb, F_WRLCK,
TDB_HASH_LOCK_START, 0,
- TDB_LOCK_WAIT|TDB_LOCK_PROBE) == 0) {
+ TDB_LOCK_WAIT|TDB_LOCK_PROBE) == TDB_SUCCESS) {
tdb->allrecord_lock.ltype = F_WRLCK;
tdb->allrecord_lock.off = 0;
- return 0;
+ return TDB_SUCCESS;
}
if (errno != EDEADLK) {
break;
tv.tv_usec = 1;
select(0, NULL, NULL, NULL, &tv);
}
- tdb->log(tdb, TDB_DEBUG_WARNING, tdb->log_priv,
- "tdb_allrecord_upgrade failed\n");
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_ERROR,
+ "tdb_allrecord_upgrade failed");
}
static struct tdb_lock_type *find_nestlock(struct tdb_context *tdb,
return NULL;
}
-int tdb_lock_and_recover(struct tdb_context *tdb)
+enum TDB_ERROR tdb_lock_and_recover(struct tdb_context *tdb)
{
- int ret;
+ enum TDB_ERROR ecode;
- if (tdb_allrecord_lock(tdb, F_WRLCK, TDB_LOCK_WAIT|TDB_LOCK_NOCHECK,
- false) == -1) {
- return -1;
+ ecode = tdb_allrecord_lock(tdb, F_WRLCK, TDB_LOCK_WAIT|TDB_LOCK_NOCHECK,
+ false);
+ if (ecode != TDB_SUCCESS) {
+ return ecode;
}
- if (tdb_lock_open(tdb, TDB_LOCK_WAIT|TDB_LOCK_NOCHECK) == -1) {
+ ecode = tdb_lock_open(tdb, TDB_LOCK_WAIT|TDB_LOCK_NOCHECK);
+ if (ecode != TDB_SUCCESS) {
tdb_allrecord_unlock(tdb, F_WRLCK);
- return -1;
+ return ecode;
+ }
+ if (tdb_transaction_recover(tdb) == -1) {
+ ecode = tdb->ecode;
}
- ret = tdb_transaction_recover(tdb);
tdb_unlock_open(tdb);
tdb_allrecord_unlock(tdb, F_WRLCK);
- return ret;
+ return ecode;
}
/* lock an offset in the database. */
-static int tdb_nest_lock(struct tdb_context *tdb, tdb_off_t offset, int ltype,
- enum tdb_lock_flags flags)
+static enum TDB_ERROR tdb_nest_lock(struct tdb_context *tdb,
+ tdb_off_t offset, int ltype,
+ enum tdb_lock_flags flags)
{
struct tdb_lock_type *new_lck;
+ enum TDB_ERROR ecode;
if (offset > TDB_HASH_LOCK_START + TDB_HASH_LOCK_RANGE + tdb->map_size / 8) {
- tdb->ecode = TDB_ERR_LOCK;
- tdb->log(tdb, TDB_DEBUG_FATAL, tdb->log_priv,
- "tdb_nest_lock: invalid offset %llu ltype=%d\n",
- (long long)offset, ltype);
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_ERROR,
+ "tdb_nest_lock: invalid offset %zu ltype=%d",
+ (size_t)offset, ltype);
}
if (tdb->flags & TDB_NOLOCK)
- return 0;
+ return TDB_SUCCESS;
+
+ add_stat(tdb, locks, 1);
new_lck = find_nestlock(tdb, offset);
if (new_lck) {
if (new_lck->ltype == F_RDLCK && ltype == F_WRLCK) {
- tdb->ecode = TDB_ERR_LOCK;
- tdb->log(tdb, TDB_DEBUG_FATAL, tdb->log_priv,
- "tdb_nest_lock: offset %llu has read lock\n",
- (long long)offset);
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_ERROR,
+ "tdb_nest_lock:"
+ " offset %zu has read lock",
+ (size_t)offset);
}
/* Just increment the struct, posix locks don't stack. */
new_lck->count++;
- return 0;
+ return TDB_SUCCESS;
}
if (tdb->num_lockrecs
&& offset >= TDB_HASH_LOCK_START
&& offset < TDB_HASH_LOCK_START + TDB_HASH_LOCK_RANGE) {
- tdb->ecode = TDB_ERR_LOCK;
- tdb->log(tdb, TDB_DEBUG_FATAL, tdb->log_priv,
- "tdb_nest_lock: already have a hash lock?\n");
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_ERROR,
+ "tdb_nest_lock: already have a hash lock?");
}
new_lck = (struct tdb_lock_type *)realloc(
tdb->lockrecs,
sizeof(*tdb->lockrecs) * (tdb->num_lockrecs+1));
if (new_lck == NULL) {
- tdb->ecode = TDB_ERR_OOM;
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_nest_lock: unable to allocate %llu lock struct",
- (long long)(tdb->num_lockrecs + 1));
- errno = ENOMEM;
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_OOM, TDB_LOG_ERROR,
+ "tdb_nest_lock:"
+ " unable to allocate %zu lock struct",
+ tdb->num_lockrecs + 1);
}
tdb->lockrecs = new_lck;
/* Since fcntl locks don't nest, we do a lock for the first one,
and simply bump the count for future ones */
- if (tdb_brlock(tdb, ltype, offset, 1, flags)) {
- return -1;
+ ecode = tdb_brlock(tdb, ltype, offset, 1, flags);
+ if (ecode != TDB_SUCCESS) {
+ return ecode;
}
/* First time we grab a lock, perhaps someone died in commit? */
&& unlikely(tdb_needs_recovery(tdb))) {
tdb_brunlock(tdb, ltype, offset, 1);
- if (tdb_lock_and_recover(tdb) == -1) {
- return -1;
+ ecode = tdb_lock_and_recover(tdb);
+ if (ecode == TDB_SUCCESS) {
+ ecode = tdb_brlock(tdb, ltype, offset, 1, flags);
}
-
- if (tdb_brlock(tdb, ltype, offset, 1, flags)) {
- return -1;
+ if (ecode != TDB_SUCCESS) {
+ return ecode;
}
}
tdb->lockrecs[tdb->num_lockrecs].ltype = ltype;
tdb->num_lockrecs++;
- return 0;
+ return TDB_SUCCESS;
}
-static int tdb_nest_unlock(struct tdb_context *tdb, tdb_off_t off, int ltype)
+static enum TDB_ERROR tdb_nest_unlock(struct tdb_context *tdb,
+ tdb_off_t off, int ltype)
{
- int ret = -1;
struct tdb_lock_type *lck;
+ enum TDB_ERROR ecode;
if (tdb->flags & TDB_NOLOCK)
- return 0;
+ return TDB_SUCCESS;
lck = find_nestlock(tdb, off);
if ((lck == NULL) || (lck->count == 0)) {
- tdb->ecode = TDB_ERR_LOCK;
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_nest_unlock: no lock for %llu\n", (long long)off);
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_ERROR,
+ "tdb_nest_unlock: no lock for %zu",
+ (size_t)off);
}
if (lck->count > 1) {
lck->count--;
- return 0;
+ return TDB_SUCCESS;
}
/*
* element, we're about to overwrite it with the last array element
* anyway.
*/
- ret = tdb_brunlock(tdb, ltype, off, 1);
+ ecode = tdb_brunlock(tdb, ltype, off, 1);
/*
* Shrink the array by overwriting the element just unlocked with the
*/
*lck = tdb->lockrecs[--tdb->num_lockrecs];
- return ret;
+ return ecode;
}
/*
get the transaction lock
*/
-int tdb_transaction_lock(struct tdb_context *tdb, int ltype)
+enum TDB_ERROR tdb_transaction_lock(struct tdb_context *tdb, int ltype)
{
return tdb_nest_lock(tdb, TDB_TRANSACTION_LOCK, ltype, TDB_LOCK_WAIT);
}
/*
release the transaction lock
*/
-int tdb_transaction_unlock(struct tdb_context *tdb, int ltype)
+void tdb_transaction_unlock(struct tdb_context *tdb, int ltype)
{
- return tdb_nest_unlock(tdb, TDB_TRANSACTION_LOCK, ltype);
+ tdb_nest_unlock(tdb, TDB_TRANSACTION_LOCK, ltype);
}
/* We only need to lock individual bytes, but Linux merges consecutive locks
* so we lock in contiguous ranges. */
-static int tdb_lock_gradual(struct tdb_context *tdb,
- int ltype, enum tdb_lock_flags flags,
- tdb_off_t off, tdb_off_t len)
+static enum TDB_ERROR tdb_lock_gradual(struct tdb_context *tdb,
+ int ltype, enum tdb_lock_flags flags,
+ tdb_off_t off, tdb_off_t len)
{
- int ret;
+ enum TDB_ERROR ecode;
enum tdb_lock_flags nb_flags = (flags & ~TDB_LOCK_WAIT);
if (len <= 1) {
}
/* First we try non-blocking. */
- ret = tdb_brlock(tdb, ltype, off, len, nb_flags);
- if (ret == 0) {
- return 0;
+ if (tdb_brlock(tdb, ltype, off, len, nb_flags) == TDB_SUCCESS) {
+ return TDB_SUCCESS;
}
/* Try locking first half, then second. */
- ret = tdb_lock_gradual(tdb, ltype, flags, off, len / 2);
- if (ret == -1)
- return -1;
+ ecode = tdb_lock_gradual(tdb, ltype, flags, off, len / 2);
+ if (ecode != TDB_SUCCESS)
+ return ecode;
- ret = tdb_lock_gradual(tdb, ltype, flags,
- off + len / 2, len - len / 2);
- if (ret == -1) {
+ ecode = tdb_lock_gradual(tdb, ltype, flags,
+ off + len / 2, len - len / 2);
+ if (ecode != TDB_SUCCESS) {
tdb_brunlock(tdb, ltype, off, len / 2);
- return -1;
}
- return 0;
+ return ecode;
}
/* lock/unlock entire database. It can only be upgradable if you have some
* other way of guaranteeing exclusivity (ie. transaction write lock). */
-int tdb_allrecord_lock(struct tdb_context *tdb, int ltype,
- enum tdb_lock_flags flags, bool upgradable)
+enum TDB_ERROR tdb_allrecord_lock(struct tdb_context *tdb, int ltype,
+ enum tdb_lock_flags flags, bool upgradable)
{
+ enum TDB_ERROR ecode;
+
/* FIXME: There are no locks on read-only dbs */
if (tdb->read_only) {
- tdb->ecode = TDB_ERR_LOCK;
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_allrecord_lock: read-only\n");
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_USE_ERROR,
+ "tdb_allrecord_lock: read-only");
}
if (tdb->allrecord_lock.count
&& (ltype == F_RDLCK || tdb->allrecord_lock.ltype == F_WRLCK)) {
tdb->allrecord_lock.count++;
- return 0;
+ return TDB_SUCCESS;
}
if (tdb->allrecord_lock.count) {
/* a global lock of a different type exists */
- tdb->ecode = TDB_ERR_LOCK;
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_allrecord_lock: already have %s lock\n",
- tdb->allrecord_lock.ltype == F_RDLCK
- ? "read" : "write");
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_USE_ERROR,
+ "tdb_allrecord_lock: already have %s lock",
+ tdb->allrecord_lock.ltype == F_RDLCK
+ ? "read" : "write");
}
if (tdb_has_hash_locks(tdb)) {
/* can't combine global and chain locks */
- tdb->ecode = TDB_ERR_LOCK;
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_allrecord_lock: already have chain lock\n");
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_USE_ERROR,
+ "tdb_allrecord_lock:"
+ " already have chain lock");
}
if (upgradable && ltype != F_RDLCK) {
/* tdb error: you can't upgrade a write lock! */
- tdb->ecode = TDB_ERR_LOCK;
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_allrecord_lock: can't upgrade a write lock\n");
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_ERROR,
+ "tdb_allrecord_lock:"
+ " can't upgrade a write lock");
}
+ add_stat(tdb, locks, 1);
again:
/* Lock hashes, gradually. */
- if (tdb_lock_gradual(tdb, ltype, flags, TDB_HASH_LOCK_START,
- TDB_HASH_LOCK_RANGE)) {
+ ecode = tdb_lock_gradual(tdb, ltype, flags, TDB_HASH_LOCK_START,
+ TDB_HASH_LOCK_RANGE);
+ if (ecode != TDB_SUCCESS) {
if (!(flags & TDB_LOCK_PROBE)) {
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_allrecord_lock hashes failed (%s)\n",
- strerror(errno));
+ tdb_logerr(tdb, ecode, TDB_LOG_ERROR,
+ "tdb_allrecord_lock hashes failed");
}
- return -1;
+ return ecode;
}
- /* Lock free lists: there to end of file. */
- if (tdb_brlock(tdb, ltype, TDB_HASH_LOCK_START + TDB_HASH_LOCK_RANGE,
- 0, flags)) {
+ /* Lock free tables: there to end of file. */
+ ecode = tdb_brlock(tdb, ltype,
+ TDB_HASH_LOCK_START + TDB_HASH_LOCK_RANGE,
+ 0, flags);
+ if (ecode != TDB_SUCCESS) {
if (!(flags & TDB_LOCK_PROBE)) {
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_allrecord_lock freelist failed (%s)\n",
- strerror(errno));
+ tdb_logerr(tdb, ecode, TDB_LOG_ERROR,
+ "tdb_allrecord_lock freetables failed");
}
- tdb_brunlock(tdb, ltype, TDB_HASH_LOCK_START,
+ tdb_brunlock(tdb, ltype, TDB_HASH_LOCK_START,
TDB_HASH_LOCK_RANGE);
- return -1;
+ return ecode;
}
tdb->allrecord_lock.count = 1;
/* Now check for needing recovery. */
if (!(flags & TDB_LOCK_NOCHECK) && unlikely(tdb_needs_recovery(tdb))) {
tdb_allrecord_unlock(tdb, ltype);
- if (tdb_lock_and_recover(tdb) == -1) {
- return -1;
- }
+ ecode = tdb_lock_and_recover(tdb);
+ if (ecode != TDB_SUCCESS) {
+ return ecode;
+ }
goto again;
}
- return 0;
+ return TDB_SUCCESS;
}
-int tdb_lock_open(struct tdb_context *tdb, enum tdb_lock_flags flags)
+enum TDB_ERROR tdb_lock_open(struct tdb_context *tdb, enum tdb_lock_flags flags)
{
return tdb_nest_lock(tdb, TDB_OPEN_LOCK, F_WRLCK, flags);
}
return find_nestlock(tdb, TDB_OPEN_LOCK) != NULL;
}
-int tdb_lock_expand(struct tdb_context *tdb, int ltype)
+enum TDB_ERROR tdb_lock_expand(struct tdb_context *tdb, int ltype)
{
/* Lock doesn't protect data, so don't check (we recurse if we do!) */
return tdb_nest_lock(tdb, TDB_EXPANSION_LOCK, ltype,
}
/* unlock entire db */
-int tdb_allrecord_unlock(struct tdb_context *tdb, int ltype)
+void tdb_allrecord_unlock(struct tdb_context *tdb, int ltype)
{
- /* FIXME: There are no locks on read-only dbs */
- if (tdb->read_only) {
- tdb->ecode = TDB_ERR_LOCK;
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_allrecord_unlock: read-only\n");
- return -1;
- }
-
if (tdb->allrecord_lock.count == 0) {
- tdb->ecode = TDB_ERR_LOCK;
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_allrecord_unlock: not locked!\n");
- return -1;
+ tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_USE_ERROR,
+ "tdb_allrecord_unlock: not locked!");
+ return;
}
/* Upgradable locks are marked as write locks. */
if (tdb->allrecord_lock.ltype != ltype
&& (!tdb->allrecord_lock.off || ltype != F_RDLCK)) {
- tdb->ecode = TDB_ERR_LOCK;
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_allrecord_unlock: have %s lock\n",
- tdb->allrecord_lock.ltype == F_RDLCK
- ? "read" : "write");
- return -1;
+ tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_ERROR,
+ "tdb_allrecord_unlock: have %s lock",
+ tdb->allrecord_lock.ltype == F_RDLCK
+ ? "read" : "write");
+ return;
}
if (tdb->allrecord_lock.count > 1) {
tdb->allrecord_lock.count--;
- return 0;
+ return;
}
tdb->allrecord_lock.count = 0;
tdb->allrecord_lock.ltype = 0;
- return tdb_brunlock(tdb, ltype, TDB_HASH_LOCK_START, 0);
+ tdb_brunlock(tdb, ltype, TDB_HASH_LOCK_START, 0);
}
bool tdb_has_expansion_lock(struct tdb_context *tdb)
return false;
}
-int tdb_lock_hashes(struct tdb_context *tdb,
- tdb_off_t hash_lock,
- tdb_len_t hash_range,
- int ltype, enum tdb_lock_flags waitflag)
+enum TDB_ERROR tdb_lock_hashes(struct tdb_context *tdb,
+ tdb_off_t hash_lock,
+ tdb_len_t hash_range,
+ int ltype, enum tdb_lock_flags waitflag)
{
/* FIXME: Do this properly, using hlock_range */
unsigned lock = TDB_HASH_LOCK_START
/* a allrecord lock allows us to avoid per chain locks */
if (tdb->allrecord_lock.count &&
(ltype == tdb->allrecord_lock.ltype || ltype == F_RDLCK)) {
- return 0;
+ return TDB_SUCCESS;
}
if (tdb->allrecord_lock.count) {
- tdb->ecode = TDB_ERR_LOCK;
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_lock_hashes: have %s allrecordlock\n",
- tdb->allrecord_lock.ltype == F_RDLCK
- ? "read" : "write");
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_USE_ERROR,
+ "tdb_lock_hashes:"
+ " already have %s allrecordlock",
+ tdb->allrecord_lock.ltype == F_RDLCK
+ ? "read" : "write");
}
if (tdb_has_free_lock(tdb)) {
- tdb->ecode = TDB_ERR_LOCK;
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_lock_hashes: have free lock already\n");
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_ERROR,
+ "tdb_lock_hashes: already have free lock");
}
if (tdb_has_expansion_lock(tdb)) {
- tdb->ecode = TDB_ERR_LOCK;
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_lock_hashes: have expansion lock already\n");
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_ERROR,
+ "tdb_lock_hashes:"
+ " already have expansion lock");
}
return tdb_nest_lock(tdb, lock, ltype, waitflag);
}
-int tdb_unlock_hashes(struct tdb_context *tdb,
- tdb_off_t hash_lock,
- tdb_len_t hash_range, int ltype)
+enum TDB_ERROR tdb_unlock_hashes(struct tdb_context *tdb,
+ tdb_off_t hash_lock,
+ tdb_len_t hash_range, int ltype)
{
unsigned lock = TDB_HASH_LOCK_START
+ (hash_lock >> (64 - TDB_HASH_LOCK_RANGE_BITS));
if (tdb->allrecord_lock.count) {
if (tdb->allrecord_lock.ltype == F_RDLCK
&& ltype == F_WRLCK) {
- tdb->ecode = TDB_ERR_LOCK;
- tdb->log(tdb, TDB_DEBUG_FATAL, tdb->log_priv,
- "tdb_unlock_hashes RO allrecord!\n");
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_ERROR,
+ "tdb_unlock_hashes RO allrecord!");
}
- return 0;
+ return TDB_SUCCESS;
}
return tdb_nest_unlock(tdb, lock, ltype);
+ b_off / sizeof(tdb_off_t);
}
-int tdb_lock_free_bucket(struct tdb_context *tdb, tdb_off_t b_off,
- enum tdb_lock_flags waitflag)
+enum TDB_ERROR tdb_lock_free_bucket(struct tdb_context *tdb, tdb_off_t b_off,
+ enum tdb_lock_flags waitflag)
{
assert(b_off >= sizeof(struct tdb_header));
if (tdb->allrecord_lock.count) {
if (tdb->allrecord_lock.ltype == F_WRLCK)
return 0;
- tdb->ecode = TDB_ERR_LOCK;
- tdb->log(tdb, TDB_DEBUG_FATAL, tdb->log_priv,
- "tdb_lock_free_bucket with RO allrecordlock!\n");
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_ERROR,
+ "tdb_lock_free_bucket with"
+ " read-only allrecordlock!");
}
#if 0 /* FIXME */
if (tdb_has_expansion_lock(tdb)) {
- tdb->ecode = TDB_ERR_LOCK;
- tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
- "tdb_lock_free_bucket: have expansion lock already\n");
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_ERROR,
+ "tdb_lock_free_bucket:"
+ " already have expansion lock");
}
#endif
projects / ccan / blobdiff