static int lock(struct tdb_context *tdb,
int rw, off_t off, off_t len, bool waitflag)
{
+ int ret;
if (tdb->file->allrecord_lock.count == 0
&& tdb->file->num_lockrecs == 0) {
tdb->file->locker = getpid();
}
tdb->stats.lock_lowlevel++;
- if (!waitflag)
+ ret = tdb->lock_fn(tdb->file->fd, rw, off, len, waitflag,
+ tdb->lock_data);
+ if (!waitflag) {
tdb->stats.lock_nonblock++;
- return tdb->lock_fn(tdb->file->fd, rw, off, len, waitflag,
- tdb->lock_data);
+ if (ret != 0)
+ tdb->stats.lock_nonblock_fail++;
+ }
+ return ret;
}
static int unlock(struct tdb_context *tdb, int rw, off_t off, off_t len)
return ecode;
}
- ecode = tdb_lock_open(tdb, TDB_LOCK_WAIT|TDB_LOCK_NOCHECK);
+ ecode = tdb_lock_open(tdb, F_WRLCK, TDB_LOCK_WAIT|TDB_LOCK_NOCHECK);
if (ecode != TDB_SUCCESS) {
tdb_allrecord_unlock(tdb, F_WRLCK);
return ecode;
}
ecode = tdb_transaction_recover(tdb);
- tdb_unlock_open(tdb);
+ tdb_unlock_open(tdb, F_WRLCK);
tdb_allrecord_unlock(tdb, F_WRLCK);
return ecode;
goto again;
}
-enum TDB_ERROR tdb_lock_open(struct tdb_context *tdb, enum tdb_lock_flags flags)
+enum TDB_ERROR tdb_lock_open(struct tdb_context *tdb,
+ int ltype, enum tdb_lock_flags flags)
{
- return tdb_nest_lock(tdb, TDB_OPEN_LOCK, F_WRLCK, flags);
+ return tdb_nest_lock(tdb, TDB_OPEN_LOCK, ltype, flags);
}
-void tdb_unlock_open(struct tdb_context *tdb)
+void tdb_unlock_open(struct tdb_context *tdb, int ltype)
{
- tdb_nest_unlock(tdb, TDB_OPEN_LOCK, F_WRLCK);
+ tdb_nest_unlock(tdb, TDB_OPEN_LOCK, ltype);
}
bool tdb_has_open_lock(struct tdb_context *tdb)