diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:16:13 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:16:13 +0930 |
| commit | bdc5499205367eccef5700cba8af95ba941ac9b2 (patch) | |
| tree | 1e6da444d90d469c8cd600c0006c7477150b5aa8 /lib/tdb2/lock.c | |
| parent | 37c704be0af3b5915e6630264dc4379309d83160 (diff) | |
| download | samba-bdc5499205367eccef5700cba8af95ba941ac9b2.tar.gz samba-bdc5499205367eccef5700cba8af95ba941ac9b2.tar.bz2 samba-bdc5499205367eccef5700cba8af95ba941ac9b2.zip | |
tdb2: add TDB_RDONLY flag, allow setting/unsetting it.
You can only unset it if the TDB was originally opened O_RDWR.
Also, cleaned up error handling in tdb_allrecord_lock() so we only get
one log message on a r/o database.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit b87e14495d5b07e1b247218a72329f10ecb3da7f)
Diffstat (limited to 'lib/tdb2/lock.c')
| -rw-r--r-- | lib/tdb2/lock.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/tdb2/lock.c b/lib/tdb2/lock.c index 76b8bc3157..957adf8335 100644 --- a/lib/tdb2/lock.c +++ b/lib/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. */ |