git.samba.org
/
sahlberg
/
ctdb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e5af0ce
)
patch tdb-refactor-tdb_lock-and-tdb_lock_nonblock.patch
author
Rusty Russell
<rusty@rustcorp.com.au>
Thu, 22 Apr 2010 04:24:06 +0000
(13:54 +0930)
committer
Rusty Russell
<rusty@rustcorp.com.au>
Thu, 22 Apr 2010 04:24:06 +0000
(13:54 +0930)
(Imported from commit
1bf482b9ef9ec73dd7ee4387d7087aa3955503dd
)
lib/tdb/common/lock.c
patch
|
blob
|
history
diff --git
a/lib/tdb/common/lock.c
b/lib/tdb/common/lock.c
index 030460c781154141e90b57e0a63708a4964d41bf..adff8a6580882cc4c9cf3da547e4b139cfb66c8b 100644
(file)
--- a/
lib/tdb/common/lock.c
+++ b/
lib/tdb/common/lock.c
@@
-309,8
+309,8
@@
int tdb_nest_lock(struct tdb_context *tdb, uint32_t offset, int ltype,
return 0;
}
return 0;
}
-/* lock a list in the database. list -1 is the alloc list */
-
int tdb_lock(struct tdb_context *tdb, int list, int ltype
)
+static int tdb_lock_list(struct tdb_context *tdb, int list, int ltype,
+
enum tdb_lock_flags waitflag
)
{
int ret;
{
int ret;
@@
-324,9
+324,17
@@
int tdb_lock(struct tdb_context *tdb, int list, int ltype)
tdb->ecode = TDB_ERR_LOCK;
ret = -1;
} else {
tdb->ecode = TDB_ERR_LOCK;
ret = -1;
} else {
- ret = tdb_nest_lock(tdb, lock_offset(list), ltype,
- TDB_LOCK_WAIT);
+ ret = tdb_nest_lock(tdb, lock_offset(list), ltype, waitflag);
}
}
+ return ret;
+}
+
+/* lock a list in the database. list -1 is the alloc list */
+int tdb_lock(struct tdb_context *tdb, int list, int ltype)
+{
+ int ret;
+
+ ret = tdb_lock_list(tdb, list, ltype, TDB_LOCK_WAIT);
if (ret) {
TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_lock failed on list %d "
"ltype=%d (%s)\n", list, ltype, strerror(errno)));
if (ret) {
TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_lock failed on list %d "
"ltype=%d (%s)\n", list, ltype, strerror(errno)));
@@
-337,18
+345,7
@@
int tdb_lock(struct tdb_context *tdb, int list, int ltype)
/* lock a list in the database. list -1 is the alloc list. non-blocking lock */
int tdb_lock_nonblock(struct tdb_context *tdb, int list, int ltype)
{
/* lock a list in the database. list -1 is the alloc list. non-blocking lock */
int tdb_lock_nonblock(struct tdb_context *tdb, int list, int ltype)
{
- /* 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;
- }
-
- if (tdb->allrecord_lock.count) {
- tdb->ecode = TDB_ERR_LOCK;
- return -1;
- }
-
- return tdb_nest_lock(tdb, lock_offset(list), ltype, TDB_LOCK_NOWAIT);
+ return tdb_lock_list(tdb, list, ltype, TDB_LOCK_NOWAIT);
}
}