ctdb-client: Drop tdb_flags argument to ctdb_attach()
authorAmitay Isaacs <amitay@gmail.com>
Fri, 23 Jun 2017 05:59:16 +0000 (15:59 +1000)
committerMartin Schwenke <martins@samba.org>
Mon, 26 Jun 2017 13:47:24 +0000 (15:47 +0200)
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
ctdb/client/ctdb_client.c
ctdb/include/ctdb_client.h
ctdb/server/ctdb_recoverd.c

index 319eee4ad39828f37ec74ff4fe85fe1d1b7b6cf5..6adf87894abc5d1552515cd4c051385ea3c51ff5 100644 (file)
@@ -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);
index aa0d6b010f874de3cbd722861845bf464701b75e..94b9be4d804d1206dfa88620c0f04dbaf4a8d930 100644 (file)
@@ -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);
 
index 84710001c3683ed8508d13926976a23d7e77080c..b57be0634b8ac44d18b921eb519dc81a5a50d31b 100644 (file)
@@ -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;