diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2017-06-23 15:59:16 +1000 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2017-06-26 15:47:24 +0200 |
| commit | ea91967b0df5f260f7da6532628f015f26f6d0e0 (patch) | |
| tree | b414d971d4f3136a69fab68716434cdebe1aa3a1 /ctdb | |
| parent | 2100008f81ee3cdb0024b1f2f20eae434083b846 (diff) | |
| download | samba-ea91967b0df5f260f7da6532628f015f26f6d0e0.tar.gz | |
ctdb-client: Drop tdb_flags argument to ctdb_attach()
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/client/ctdb_client.c | 5 | ||||
| -rw-r--r-- | ctdb/include/ctdb_client.h | 3 | ||||
| -rw-r--r-- | ctdb/server/ctdb_recoverd.c | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c index 319eee4ad39..6adf87894ab 100644 --- a/ctdb/client/ctdb_client.c +++ b/ctdb/client/ctdb_client.c @@ -2084,8 +2084,7 @@ int ctdb_statistics_reset(struct ctdb_context *ctdb, uint32_t destnode) struct ctdb_db_context *ctdb_attach(struct ctdb_context *ctdb, struct timeval timeout, const char *name, - bool persistent, - uint32_t tdb_flags_unused) + bool persistent) { struct ctdb_db_context *ctdb_db; TDB_DATA data; @@ -3908,7 +3907,7 @@ struct ctdb_transaction_handle *ctdb_transaction_start(struct ctdb_db_context *c } h->g_lock_db = ctdb_attach(h->ctdb_db->ctdb, timeval_current_ofs(3,0), - "g_lock.tdb", false, 0); + "g_lock.tdb", false); if (!h->g_lock_db) { DEBUG(DEBUG_ERR, (__location__ " unable to attach to g_lock.tdb\n")); talloc_free(h); diff --git a/ctdb/include/ctdb_client.h b/ctdb/include/ctdb_client.h index aa0d6b010f8..94b9be4d804 100644 --- a/ctdb/include/ctdb_client.h +++ b/ctdb/include/ctdb_client.h @@ -273,8 +273,7 @@ int ctdb_statistics_reset(struct ctdb_context *ctdb, uint32_t destnode); struct ctdb_db_context *ctdb_attach(struct ctdb_context *ctdb, struct timeval timeout, const char *name, - bool persistent, - uint32_t tdb_flags); + bool persistent); int ctdb_detach(struct ctdb_context *ctdb, uint32_t db_id); diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index 84710001c36..b57be0634b8 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -688,7 +688,7 @@ static void vacuum_fetch_handler(uint64_t srvid, TDB_DATA data, } /* attach to it */ - ctdb_db = ctdb_attach(ctdb, CONTROL_TIMEOUT(), name, persistent, 0); + ctdb_db = ctdb_attach(ctdb, CONTROL_TIMEOUT(), name, persistent); if (ctdb_db == NULL) { DEBUG(DEBUG_ERR,(__location__ " Failed to attach to database '%s'\n", name)); goto done; |