summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonnie Sahlberg <ronniesahlberg@gmail.com>2011-09-13 18:38:20 +1000
committerRonnie Sahlberg <ronniesahlberg@gmail.com>2011-09-13 18:38:20 +1000
commit8e4bfba75c5b38d37849aef0d88a619ef74aab6f (patch)
tree4e8c9f1ceb1436857fce17402d5e707e2f92dbfd
parentf5a3119dc08bc8beb34b00dded19e4c70fbbe308 (diff)
downloadsamba-8e4bfba75c5b38d37849aef0d88a619ef74aab6f.tar.gz
samba-8e4bfba75c5b38d37849aef0d88a619ef74aab6f.tar.xz
samba-8e4bfba75c5b38d37849aef0d88a619ef74aab6f.zip
ReadOnly: Rename the function ctdb_ltdb_fetch_readonly() to ctdb_ltdb_fetch_with_header() since this is what it actually does.
(This used to be ctdb commit 94a5ce4e08e7891f07dbfe4c822ca4be5ab10965)
-rw-r--r--ctdb/client/ctdb_client.c4
-rw-r--r--ctdb/common/ctdb_ltdb.c2
-rw-r--r--ctdb/include/ctdb_private.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c
index 89eeb4836a..f2359cafc7 100644
--- a/ctdb/client/ctdb_client.c
+++ b/ctdb/client/ctdb_client.c
@@ -756,7 +756,7 @@ again:
talloc_set_destructor(h, fetch_lock_destructor);
/* Check if record exists yet in the TDB */
- ret = ctdb_ltdb_fetch_readonly(ctdb_db, key, &h->header, h, data);
+ ret = ctdb_ltdb_fetch_with_header(ctdb_db, key, &h->header, h, data);
if (ret != 0) {
ctdb_ltdb_unlock(ctdb_db, key);
ret = ctdb_client_force_migration(ctdb_db, key);
@@ -829,7 +829,7 @@ again:
return NULL;
}
- ret = ctdb_ltdb_fetch_readonly(ctdb_db, key, &h->header, h, data);
+ ret = ctdb_ltdb_fetch_with_header(ctdb_db, key, &h->header, h, data);
if (ret != 0) {
ctdb_ltdb_unlock(ctdb_db, key);
diff --git a/ctdb/common/ctdb_ltdb.c b/ctdb/common/ctdb_ltdb.c
index 76274ceafb..e4662ac37f 100644
--- a/ctdb/common/ctdb_ltdb.c
+++ b/ctdb/common/ctdb_ltdb.c
@@ -125,7 +125,7 @@ int ctdb_ltdb_fetch(struct ctdb_db_context *ctdb_db,
if the record does not exist, *header will be NULL
and data = {0, NULL}
*/
-int ctdb_ltdb_fetch_readonly(struct ctdb_db_context *ctdb_db,
+int ctdb_ltdb_fetch_with_header(struct ctdb_db_context *ctdb_db,
TDB_DATA key, struct ctdb_ltdb_header *header,
TALLOC_CTX *mem_ctx, TDB_DATA *data)
{
diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index b093bf09ac..7e59473013 100644
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -671,7 +671,7 @@ int ctdb_ltdb_fetch(struct ctdb_db_context *ctdb_db,
int ctdb_ltdb_store(struct ctdb_db_context *ctdb_db, TDB_DATA key,
struct ctdb_ltdb_header *header, TDB_DATA data);
int ctdb_ltdb_delete(struct ctdb_db_context *ctdb_db, TDB_DATA key);
-int ctdb_ltdb_fetch_readonly(struct ctdb_db_context *ctdb_db,
+int ctdb_ltdb_fetch_with_header(struct ctdb_db_context *ctdb_db,
TDB_DATA key, struct ctdb_ltdb_header *header,
TALLOC_CTX *mem_ctx, TDB_DATA *data);
int32_t ctdb_control_start_persistent_update(struct ctdb_context *ctdb,