X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Flock.c;h=957adf83358057d458d09320d1ce546feb62bffe;hb=937d0babe99dcd315040a9e48430140e63e4a7df;hp=76b8bc3157977462fbebc3983caad5dbb366ed5c;hpb=de868b8eee34e39b4465dd9def9141b97926e847;p=ccan

diff --git a/ccan/tdb2/lock.c b/ccan/tdb2/lock.c
index 76b8bc31..957adf83 100644
--- a/ccan/tdb2/lock.c
+++ b/ccan/tdb2/lock.c
@@ -194,7 +194,7 @@ static enum TDB_ERROR tdb_brlock(struct tdb_context *tdb,
 		return TDB_SUCCESS;
 	}
 
-	if (rw_type == F_WRLCK && tdb->read_only) {
+	if (rw_type == F_WRLCK && (tdb->flags & TDB_RDONLY)) {
 		return tdb_logerr(tdb, TDB_ERR_RDONLY, TDB_LOG_USE_ERROR,
 				  "Write lock attempted on read-only database");
 	}
@@ -508,8 +508,9 @@ static enum TDB_ERROR tdb_lock_gradual(struct tdb_context *tdb,
 	}
 
 	/* First we try non-blocking. */
-	if (tdb_brlock(tdb, ltype, off, len, nb_flags) == TDB_SUCCESS) {
-		return TDB_SUCCESS;
+	ecode = tdb_brlock(tdb, ltype, off, len, nb_flags);
+	if (ecode != TDB_ERR_LOCK) {
+		return ecode;
 	}
 
 	/* Try locking first half, then second. */