X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Flock.c;h=666aa09038a731d2f8c0b36d605c08c8d5409235;hp=49313a5419cb7b83b7f672aaff32f5942ddf079b;hb=838db0d7ea37fc2a21d03d159b55b042f8144cb3;hpb=f6900d2358ca0ec2f2dc776b9e42e4fca7bffbdf;ds=sidebyside diff --git a/ccan/tdb2/lock.c b/ccan/tdb2/lock.c index 49313a54..666aa090 100644 --- a/ccan/tdb2/lock.c +++ b/ccan/tdb2/lock.c @@ -99,16 +99,21 @@ int tdb_fcntl_unlock(int fd, int rw, off_t off, off_t len, void *unused) 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)