diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:27:13 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:27:13 +0930 |
| commit | 3b2c10f8955096c5cb28e8ae157e0f08858c001e (patch) | |
| tree | 686db58689c9e3ca28b7c38c733f3f6a9136e16a /lib/tdb2/tdb1_open.c | |
| parent | 0b81b07110c463300431a09f24e67144f97ad8b0 (diff) | |
| download | samba-3b2c10f8955096c5cb28e8ae157e0f08858c001e.tar.gz samba-3b2c10f8955096c5cb28e8ae157e0f08858c001e.tar.bz2 samba-3b2c10f8955096c5cb28e8ae157e0f08858c001e.zip | |
tdb2: get rid of TDB1 mark and nonblock functions.
We do this using hooks in tdb2.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit 444fade529f68eb2b0aebbc8de442478c5c6f916)
Diffstat (limited to 'lib/tdb2/tdb1_open.c')
| -rw-r--r-- | lib/tdb2/tdb1_open.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/tdb2/tdb1_open.c b/lib/tdb2/tdb1_open.c index 7c5100e3d1..65bc2dba14 100644 --- a/lib/tdb2/tdb1_open.c +++ b/lib/tdb2/tdb1_open.c @@ -387,7 +387,7 @@ struct tdb1_context *tdb1_open_ex(const char *name, int hash_size, int tdb1_flag tdb->inode = st.st_ino; tdb1_mmap(tdb); if (locked) { - if (tdb1_nest_unlock(tdb, TDB1_ACTIVE_LOCK, F_WRLCK, false) == -1) { + if (tdb1_nest_unlock(tdb, TDB1_ACTIVE_LOCK, F_WRLCK) == -1) { TDB1_LOG((tdb, TDB1_DEBUG_ERROR, "tdb1_open_ex: " "failed to release ACTIVE_LOCK on %s: %s\n", name, strerror(errno))); @@ -416,7 +416,7 @@ struct tdb1_context *tdb1_open_ex(const char *name, int hash_size, int tdb1_flag /* Internal (memory-only) databases skip all the code above to * do with disk files, and resume here by releasing their * open lock and hooking into the active list. */ - if (tdb1_nest_unlock(tdb, TDB1_OPEN_LOCK, F_WRLCK, false) == -1) { + if (tdb1_nest_unlock(tdb, TDB1_OPEN_LOCK, F_WRLCK) == -1) { goto fail; } tdb->next = tdb1s; |