diff options
| author | Andrew Tridgell <tridge@samba.org> | 2007-04-26 14:51:41 +0200 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2007-04-26 14:51:41 +0200 |
| commit | 8ae14b4052bc565bee5ff8556121f613155dddd3 (patch) | |
| tree | f6e1f459eb5ec63d4426495c9cbf1993422af230 /ctdb/include | |
| parent | d955485e7be3d68554969272bfe110ebe996c360 (diff) | |
moved status to ctdb_control
(This used to be ctdb commit 9a543968ba0379fbf8e977e184f22f4349d6243f)
Diffstat (limited to 'ctdb/include')
| -rw-r--r-- | ctdb/include/ctdb.h | 2 | ||||
| -rw-r--r-- | ctdb/include/ctdb_private.h | 18 |
2 files changed, 4 insertions, 16 deletions
diff --git a/ctdb/include/ctdb.h b/ctdb/include/ctdb.h index 9691797348..2a96229549 100644 --- a/ctdb/include/ctdb.h +++ b/ctdb/include/ctdb.h @@ -213,7 +213,7 @@ struct ctdb_db_context *find_ctdb_db(struct ctdb_context *ctdb, uint32_t id); struct ctdb_context *ctdb_cmdline_client(struct event_context *ev); struct ctdb_status; -int ctdb_status(struct ctdb_context *ctdb, struct ctdb_status *status); +int ctdb_status(struct ctdb_context *ctdb, uint32_t destnode, struct ctdb_status *status); int ctdb_getdbpath(struct ctdb_db_context *ctdb_db, TDB_DATA *path); diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h index 58c71d9d1b..ee8118a750 100644 --- a/ctdb/include/ctdb_private.h +++ b/ctdb/include/ctdb_private.h @@ -145,7 +145,6 @@ struct ctdb_status { uint32_t req_register; uint32_t req_connect_wait; uint32_t req_shutdown; - uint32_t req_status; uint32_t req_control; } client; uint32_t total_calls; @@ -228,7 +227,7 @@ struct ctdb_ltdb_header { uint32_t lacount; }; -enum {CTDB_CONTROL_PROCESS_EXISTS}; +enum {CTDB_CONTROL_PROCESS_EXISTS, CTDB_CONTROL_STATUS}; enum call_state {CTDB_CALL_WAIT, CTDB_CALL_DONE, CTDB_CALL_ERROR}; @@ -280,10 +279,8 @@ enum ctdb_operation { CTDB_REQ_CONNECT_WAIT = 1001, CTDB_REPLY_CONNECT_WAIT = 1002, CTDB_REQ_SHUTDOWN = 1003, - CTDB_REQ_STATUS = 1004, - CTDB_REPLY_STATUS = 1005, - CTDB_REQ_GETDBPATH = 1006, - CTDB_REPLY_GETDBPATH = 1007 + CTDB_REQ_GETDBPATH = 1004, + CTDB_REPLY_GETDBPATH = 1005 }; #define CTDB_MAGIC 0x43544442 /* CTDB */ @@ -387,15 +384,6 @@ struct ctdb_reply_getdbpath { uint8_t data[1]; }; -struct ctdb_req_status { - struct ctdb_req_header hdr; -}; - -struct ctdb_reply_status { - struct ctdb_req_header hdr; - struct ctdb_status status; -}; - struct ctdb_req_control { struct ctdb_req_header hdr; uint32_t opcode; |