diff options
| author | Michael Adam <obnox@samba.org> | 2014-01-28 12:53:24 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2014-02-07 16:06:06 +0100 |
| commit | 6def1c3f6e145abcc81ea69505133bbe128eacac (patch) | |
| tree | e867354d33aa898bbe66b6095043d9a74d3c8b72 | |
| parent | cf0cb0add9ed47b8974272237fee0e1a4ba7bf68 (diff) | |
| download | samba-6def1c3f6e145abcc81ea69505133bbe128eacac.tar.gz samba-6def1c3f6e145abcc81ea69505133bbe128eacac.tar.xz samba-6def1c3f6e145abcc81ea69505133bbe128eacac.zip | |
dbwrap: add a dbwrap_flags argument to db_open_ctdb()
This is in preparation of directly supporting ctdb read only
record copies when opening a ctdb database from samba.
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
| -rw-r--r-- | source3/lib/dbwrap/dbwrap_ctdb.c | 6 | ||||
| -rw-r--r-- | source3/lib/dbwrap/dbwrap_ctdb.h | 3 | ||||
| -rw-r--r-- | source3/lib/dbwrap/dbwrap_open.c | 2 | ||||
| -rw-r--r-- | source3/torture/test_dbwrap_ctdb.c | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c index 98a9138f32f..2770129a177 100644 --- a/source3/lib/dbwrap/dbwrap_ctdb.c +++ b/source3/lib/dbwrap/dbwrap_ctdb.c @@ -1569,7 +1569,8 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx, const char *name, int hash_size, int tdb_flags, int open_flags, mode_t mode, - enum dbwrap_lock_order lock_order) + enum dbwrap_lock_order lock_order, + uint64_t dbwrap_flags) { struct db_context *result; struct db_ctdb_ctx *db_ctdb; @@ -1703,7 +1704,8 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx, const char *name, int hash_size, int tdb_flags, int open_flags, mode_t mode, - enum dbwrap_lock_order lock_order) + enum dbwrap_lock_order lock_order, + uint64_t dbwrap_flags) { DEBUG(3, ("db_open_ctdb: no cluster support!\n")); errno = ENOSYS; diff --git a/source3/lib/dbwrap/dbwrap_ctdb.h b/source3/lib/dbwrap/dbwrap_ctdb.h index bfbe3bde52e..3196b917bdd 100644 --- a/source3/lib/dbwrap/dbwrap_ctdb.h +++ b/source3/lib/dbwrap/dbwrap_ctdb.h @@ -31,6 +31,7 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx, const char *name, int hash_size, int tdb_flags, int open_flags, mode_t mode, - enum dbwrap_lock_order lock_order); + enum dbwrap_lock_order lock_order, + uint64_t dbwrap_flags); #endif /* __DBWRAP_CTDB_H__ */ diff --git a/source3/lib/dbwrap/dbwrap_open.c b/source3/lib/dbwrap/dbwrap_open.c index 6c9280cedbb..61324f7c2de 100644 --- a/source3/lib/dbwrap/dbwrap_open.c +++ b/source3/lib/dbwrap/dbwrap_open.c @@ -104,7 +104,7 @@ struct db_context *db_open(TALLOC_CTX *mem_ctx, if (lp_parm_bool(-1, "ctdb", partname, True)) { result = db_open_ctdb(mem_ctx, partname, hash_size, tdb_flags, open_flags, mode, - lock_order); + lock_order, dbwrap_flags); if (result == NULL) { DEBUG(0,("failed to attach to ctdb %s\n", partname)); diff --git a/source3/torture/test_dbwrap_ctdb.c b/source3/torture/test_dbwrap_ctdb.c index f7672ba4ff1..d7380b1dad2 100644 --- a/source3/torture/test_dbwrap_ctdb.c +++ b/source3/torture/test_dbwrap_ctdb.c @@ -32,7 +32,7 @@ bool run_local_dbwrap_ctdb(int dummy) uint32_t val; db = db_open_ctdb(talloc_tos(), "torture.tdb", 0, TDB_DEFAULT, - O_RDWR, 0755, DBWRAP_LOCK_ORDER_1); + O_RDWR, 0755, DBWRAP_LOCK_ORDER_1, DBWRAP_FLAG_NONE); if (db == NULL) { perror("db_open_ctdb failed"); goto fail; |