[SCM] CTDB repository - branch master updated - 0de79352c9b36c118e36905f08ebbe38ecbb957e

[Ronnie Sahlberg]

The branch, master has been updated
       via  0de79352c9b36c118e36905f08ebbe38ecbb957e (commit)
      from  b08a988fbdad0da850c9b79791c1a8970555147f (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 0de79352c9b36c118e36905f08ebbe38ecbb957e
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Tue Jul 22 09:07:42 2008 +1000

    From Michael Adams,
    change one element from private to private_data
    
    Signed-off-by: Ronnie Sahlberg <ronniesahlberg at gmail.com>

-----------------------------------------------------------------------

Summary of changes:
 include/ctdb_private.h |    2 +-
 server/ctdb_recoverd.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index 66e7709..77d1092 100644
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -1098,7 +1098,7 @@ struct ctdb_client_call_state {
 	struct ctdb_call *call;
 	struct {
 		void (*fn)(struct ctdb_client_call_state *);
-		void *private;
+		void *private_data;
 	} async;
 };
 
diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c
index b2533af..64a05a7 100644
--- a/server/ctdb_recoverd.c
+++ b/server/ctdb_recoverd.c
@@ -775,7 +775,7 @@ static void vacuum_fetch_next(struct vacuum_info *v);
  */
 static void vacuum_fetch_callback(struct ctdb_client_call_state *state)
 {
-	struct vacuum_info *v = talloc_get_type(state->async.private, struct vacuum_info);
+	struct vacuum_info *v = talloc_get_type(state->async.private_data, struct vacuum_info);
 	talloc_free(state);
 	vacuum_fetch_next(v);
 }
@@ -841,7 +841,7 @@ static void vacuum_fetch_next(struct vacuum_info *v)
 			return;
 		}
 		state->async.fn = vacuum_fetch_callback;
-		state->async.private = v;
+		state->async.private_data = v;
 		return;
 	}
 


-- 
CTDB repository