|
|
3062ca |
From d9caa09c45d4560c89a1ad873087c0476cabab46 Mon Sep 17 00:00:00 2001
|
|
|
3062ca |
From: Bin Liu <bliu@suse.com>
|
|
|
3062ca |
Date: Fri, 9 Dec 2016 16:10:20 +0800
|
|
|
3062ca |
Subject: [PATCH] Qdevice: fix spell errors in qdevice
|
|
|
3062ca |
|
|
|
3062ca |
There are somwe spell errors in qdevice-net-algo-test.c,
|
|
|
3062ca |
qnetd-algo-2nodelms.c, qnetd-algo-test.c qnetd-algo-ffsplit.c
|
|
|
3062ca |
|
|
|
3062ca |
Signed-off-by: Bin Liu <bliu@suse.com>
|
|
|
3062ca |
Reviewed-by: Jan Friesse <jfriesse@redhat.com>
|
|
|
3062ca |
(cherry picked from commit 5cf587554f6fe5c0216b46a3b0546810139b3e22)
|
|
|
3062ca |
---
|
|
|
3062ca |
qdevices/qdevice-net-algo-test.c | 12 ++++++------
|
|
|
3062ca |
qdevices/qnetd-algo-2nodelms.c | 4 ++--
|
|
|
3062ca |
qdevices/qnetd-algo-ffsplit.c | 4 ++--
|
|
|
3062ca |
qdevices/qnetd-algo-test.c | 10 +++++-----
|
|
|
3062ca |
4 files changed, 15 insertions(+), 15 deletions(-)
|
|
|
3062ca |
|
|
|
3062ca |
diff --git a/qdevices/qdevice-net-algo-test.c b/qdevices/qdevice-net-algo-test.c
|
|
|
3062ca |
index d3bf1c4..2a33078 100644
|
|
|
3062ca |
--- a/qdevices/qdevice-net-algo-test.c
|
|
|
3062ca |
+++ b/qdevices/qdevice-net-algo-test.c
|
|
|
3062ca |
@@ -87,7 +87,7 @@ qdevice_net_algo_test_connected(struct qdevice_net_instance *instance, int *send
|
|
|
3062ca |
* if cast_vote_timer_vote = TLV_VOTE_ACK
|
|
|
3062ca |
* vote = TLV_VOTE_NACK.
|
|
|
3062ca |
* Otherwise send_node_list = 1 and vote = TLV_VOTE_NO_CHANGE
|
|
|
3062ca |
- * If send_node_list is set to non zero, node list is send to qnetd
|
|
|
3062ca |
+ * If send_node_list is set to non zero, node list is sent to qnetd
|
|
|
3062ca |
*/
|
|
|
3062ca |
int
|
|
|
3062ca |
qdevice_net_algo_test_config_node_list_changed(struct qdevice_net_instance *instance,
|
|
|
3062ca |
@@ -112,7 +112,7 @@ qdevice_net_algo_test_config_node_list_changed(struct qdevice_net_instance *inst
|
|
|
3062ca |
* if cast_vote_timer_vote = TLV_VOTE_ACK
|
|
|
3062ca |
* vote = TLV_VOTE_NACK.
|
|
|
3062ca |
* Otherwise send_node_list = 1 and vote = TLV_VOTE_WAIT_FOR_REPLY
|
|
|
3062ca |
- * If send_node_list is set to non zero, node list is send to qnetd
|
|
|
3062ca |
+ * If send_node_list is set to non zero, node list is sent to qnetd
|
|
|
3062ca |
*/
|
|
|
3062ca |
int
|
|
|
3062ca |
qdevice_net_algo_test_votequorum_node_list_notify(struct qdevice_net_instance *instance,
|
|
|
3062ca |
@@ -140,7 +140,7 @@ qdevice_net_algo_test_votequorum_node_list_notify(struct qdevice_net_instance *i
|
|
|
3062ca |
* vote = TLV_VOTE_NACK.
|
|
|
3062ca |
* Otherwise send_node_list = 1 and vote = TLV_VOTE_NO_CHANGE
|
|
|
3062ca |
*
|
|
|
3062ca |
- * If send_node_list is set to non zero, node list is send to qnetd
|
|
|
3062ca |
+ * If send_node_list is set to non zero, node list is sent to qnetd
|
|
|
3062ca |
*/
|
|
|
3062ca |
int
|
|
|
3062ca |
qdevice_net_algo_test_votequorum_quorum_notify(struct qdevice_net_instance *instance,
|
|
|
3062ca |
@@ -172,7 +172,7 @@ qdevice_net_algo_test_votequorum_expected_votes_notify(struct qdevice_net_instan
|
|
|
3062ca |
/*
|
|
|
3062ca |
* Called when config node list reply is received. Vote is set to value returned by server (and can
|
|
|
3062ca |
* be overwriten by algorithm). ring_id is returned by server. ring_id_is_valid is set to 1 only if
|
|
|
3062ca |
- * received ring id matches last sent ring id. It usually make sense to not update timer.
|
|
|
3062ca |
+ * received ring id matches last sent ring id. It usually makes sense to not update timer.
|
|
|
3062ca |
*
|
|
|
3062ca |
* Callback should return 0 on success or -1 on failure (-> disconnect client).
|
|
|
3062ca |
*/
|
|
|
3062ca |
@@ -309,7 +309,7 @@ qdevice_net_algo_test_echo_reply_received(struct qdevice_net_instance *instance,
|
|
|
3062ca |
* Called when client is about to send echo request but echo reply to previous echo request
|
|
|
3062ca |
* was not yet received.
|
|
|
3062ca |
*
|
|
|
3062ca |
- * Callback should return 0 if processing should continue (echo request is not send but timer is
|
|
|
3062ca |
+ * Callback should return 0 if processing should continue (echo request is not sent but timer is
|
|
|
3062ca |
* scheduled again) otherwise -1 (-> disconnect client).
|
|
|
3062ca |
*/
|
|
|
3062ca |
int
|
|
|
3062ca |
@@ -322,7 +322,7 @@ qdevice_net_algo_test_echo_reply_not_received(struct qdevice_net_instance *insta
|
|
|
3062ca |
}
|
|
|
3062ca |
|
|
|
3062ca |
/*
|
|
|
3062ca |
- * Called when client disconnect from server.
|
|
|
3062ca |
+ * Called when client disconnects from server.
|
|
|
3062ca |
*
|
|
|
3062ca |
* disconnect_reason contains one of QDEVICE_NET_DISCONNECT_REASON_
|
|
|
3062ca |
* try_reconnect can be set to non zero value if reconnect to server should be tried
|
|
|
3062ca |
diff --git a/qdevices/qnetd-algo-2nodelms.c b/qdevices/qnetd-algo-2nodelms.c
|
|
|
3062ca |
index a62b9a9..ed759ab 100644
|
|
|
3062ca |
--- a/qdevices/qnetd-algo-2nodelms.c
|
|
|
3062ca |
+++ b/qdevices/qnetd-algo-2nodelms.c
|
|
|
3062ca |
@@ -87,7 +87,7 @@ qnetd_algo_2nodelms_client_init(struct qnetd_client *client)
|
|
|
3062ca |
* should ask later for a vote) or wait_for_reply (client should wait for reply).
|
|
|
3062ca |
*
|
|
|
3062ca |
* Return TLV_REPLY_ERROR_CODE_NO_ERROR on success, different TLV_REPLY_ERROR_CODE_*
|
|
|
3062ca |
- * on failure (error is send back to client)
|
|
|
3062ca |
+ * on failure (error is sent back to client)
|
|
|
3062ca |
*/
|
|
|
3062ca |
enum tlv_reply_error_code
|
|
|
3062ca |
qnetd_algo_2nodelms_config_node_list_received(struct qnetd_client *client,
|
|
|
3062ca |
@@ -128,7 +128,7 @@ qnetd_algo_2nodelms_config_node_list_received(struct qnetd_client *client,
|
|
|
3062ca |
* should ask later for a vote) or wait_for_reply (client should wait for reply).
|
|
|
3062ca |
*
|
|
|
3062ca |
* Return TLV_REPLY_ERROR_CODE_NO_ERROR on success, different TLV_REPLY_ERROR_CODE_*
|
|
|
3062ca |
- * on failure (error is send back to client)
|
|
|
3062ca |
+ * on failure (error is sent back to client)
|
|
|
3062ca |
*/
|
|
|
3062ca |
|
|
|
3062ca |
enum tlv_reply_error_code
|
|
|
3062ca |
diff --git a/qdevices/qnetd-algo-ffsplit.c b/qdevices/qnetd-algo-ffsplit.c
|
|
|
3062ca |
index 01e5f0c..6f34cf1 100644
|
|
|
3062ca |
--- a/qdevices/qnetd-algo-ffsplit.c
|
|
|
3062ca |
+++ b/qdevices/qnetd-algo-ffsplit.c
|
|
|
3062ca |
@@ -458,8 +458,8 @@ qnetd_algo_ffsplit_update_nodes_state(struct qnetd_client *client, int client_le
|
|
|
3062ca |
|
|
|
3062ca |
/*
|
|
|
3062ca |
* Send vote info. If client_leaving is set, client is ignored. if send_acks
|
|
|
3062ca |
- * is set, only ACK votes are send (nodes in QNETD_ALGO_FFSPLIT_CLIENT_STATE_SENDING_ACK state),
|
|
|
3062ca |
- * otherwise only NACK votes are send (nodes in QNETD_ALGO_FFSPLIT_CLIENT_STATE_SENDING_NACK state)
|
|
|
3062ca |
+ * is set, only ACK votes are sent (nodes in QNETD_ALGO_FFSPLIT_CLIENT_STATE_SENDING_ACK state),
|
|
|
3062ca |
+ * otherwise only NACK votes are sent (nodes in QNETD_ALGO_FFSPLIT_CLIENT_STATE_SENDING_NACK state)
|
|
|
3062ca |
*
|
|
|
3062ca |
* Returns number of send votes
|
|
|
3062ca |
*/
|
|
|
3062ca |
diff --git a/qdevices/qnetd-algo-test.c b/qdevices/qnetd-algo-test.c
|
|
|
3062ca |
index 816d6f6..644509f 100644
|
|
|
3062ca |
--- a/qdevices/qnetd-algo-test.c
|
|
|
3062ca |
+++ b/qdevices/qnetd-algo-test.c
|
|
|
3062ca |
@@ -60,7 +60,7 @@
|
|
|
3062ca |
* client is initialized qnetd_client structure.
|
|
|
3062ca |
*
|
|
|
3062ca |
* Return TLV_REPLY_ERROR_CODE_NO_ERROR on success, different TLV_REPLY_ERROR_CODE_*
|
|
|
3062ca |
- * on failure (error is send back to client)
|
|
|
3062ca |
+ * on failure (error is sent back to client)
|
|
|
3062ca |
*/
|
|
|
3062ca |
enum tlv_reply_error_code
|
|
|
3062ca |
qnetd_algo_test_client_init(struct qnetd_client *client)
|
|
|
3062ca |
@@ -137,7 +137,7 @@ qnetd_algo_test_config_node_list_received(struct qnetd_client *client,
|
|
|
3062ca |
* should ask later for a vote) or wait_for_reply (client should wait for reply).
|
|
|
3062ca |
*
|
|
|
3062ca |
* Return TLV_REPLY_ERROR_CODE_NO_ERROR on success, different TLV_REPLY_ERROR_CODE_*
|
|
|
3062ca |
- * on failure (error is send back to client)
|
|
|
3062ca |
+ * on failure (error is sent back to client)
|
|
|
3062ca |
*/
|
|
|
3062ca |
|
|
|
3062ca |
enum tlv_reply_error_code
|
|
|
3062ca |
@@ -162,7 +162,7 @@ qnetd_algo_test_membership_node_list_received(struct qnetd_client *client,
|
|
|
3062ca |
* to use qnetd_client_send_vote_info.
|
|
|
3062ca |
*
|
|
|
3062ca |
* Return TLV_REPLY_ERROR_CODE_NO_ERROR on success, different TLV_REPLY_ERROR_CODE_*
|
|
|
3062ca |
- * on failure (error is send back to client)
|
|
|
3062ca |
+ * on failure (error is sent back to client)
|
|
|
3062ca |
*/
|
|
|
3062ca |
enum tlv_reply_error_code
|
|
|
3062ca |
qnetd_algo_test_quorum_node_list_received(struct qnetd_client *client,
|
|
|
3062ca |
@@ -229,13 +229,13 @@ qnetd_algo_test_vote_info_reply_received(struct qnetd_client *client, uint32_t m
|
|
|
3062ca |
* Called as a result of qnetd_client_algo_timer_schedule function call after timeout expires.
|
|
|
3062ca |
*
|
|
|
3062ca |
* If send_vote is set by callback to non zero value, result_vote must also be set and such vote is
|
|
|
3062ca |
- * send to client. Result_vote is ignored if send_vote = 0 (default).
|
|
|
3062ca |
+ * sent to client. Result_vote is ignored if send_vote = 0 (default).
|
|
|
3062ca |
*
|
|
|
3062ca |
* If reschedule timer (default value = 0) is set to non zero value, callback is called again later
|
|
|
3062ca |
* with same timeout as originaly created.
|
|
|
3062ca |
*
|
|
|
3062ca |
* Return TLV_REPLY_ERROR_CODE_NO_ERROR on success, different TLV_REPLY_ERROR_CODE_*
|
|
|
3062ca |
- * on failure (error is send back to client)
|
|
|
3062ca |
+ * on failure (error is sent back to client)
|
|
|
3062ca |
*/
|
|
|
3062ca |
enum tlv_reply_error_code
|
|
|
3062ca |
qnetd_algo_test_timer_callback(struct qnetd_client *client, int *reschedule_timer,
|
|
|
3062ca |
--
|
|
|
3062ca |
1.7.1
|
|
|
3062ca |
|