From 5b809fa434368b7395b180c41b46bce1a38e0cf9 Mon Sep 17 00:00:00 2001 From: Samikshan Bairagya Date: Wed, 30 Nov 2016 15:43:26 +0530 Subject: glusterd: Remove duplicate values for glusterd message macros Both GD_MSG_BRICK_CLEANUP_SUCCESS and GD_MSG_DAEMON_STATE_REQ_RCVD macros are assigned the same value (GLUSTERD_COMP_BASE + 584). Also the number of messages should be 588 instead of 587 Change-Id: I015d32435c05ded1b14cd8ba11911af826bc956b BUG: 1400026 Signed-off-by: Samikshan Bairagya Reviewed-on: http://review.gluster.org/15980 NetBSD-regression: NetBSD Build System Smoke: Gluster Build System Reviewed-by: Atin Mukherjee CentOS-regression: Gluster Build System --- xlators/mgmt/glusterd/src/glusterd-messages.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'xlators') diff --git a/xlators/mgmt/glusterd/src/glusterd-messages.h b/xlators/mgmt/glusterd/src/glusterd-messages.h index 2ba1876b6ec..d48ec897bac 100644 --- a/xlators/mgmt/glusterd/src/glusterd-messages.h +++ b/xlators/mgmt/glusterd/src/glusterd-messages.h @@ -41,7 +41,7 @@ #define GLUSTERD_COMP_BASE GLFS_MSGID_GLUSTERD -#define GLFS_NUM_MESSAGES 587 +#define GLFS_NUM_MESSAGES 588 #define GLFS_MSGID_END (GLUSTERD_COMP_BASE + GLFS_NUM_MESSAGES + 1) /* Messaged with message IDs */ @@ -4727,7 +4727,7 @@ * @recommendation * */ -#define GD_MSG_BRICK_CLEANUP_SUCCESS (GLUSTERD_COMP_BASE + 584) +#define GD_MSG_BRICK_CLEANUP_SUCCESS (GLUSTERD_COMP_BASE + 585) /*! * @messageid @@ -4735,7 +4735,7 @@ * @recommendation * */ -#define GD_MSG_STATE_STR_GET_FAILED (GLUSTERD_COMP_BASE + 585) +#define GD_MSG_STATE_STR_GET_FAILED (GLUSTERD_COMP_BASE + 586) /*! * @messageid @@ -4743,7 +4743,7 @@ * @recommendedaction * */ -#define GD_MSG_RESET_BRICK_COMMIT_FORCE_REQ_RCVD (GLUSTERD_COMP_BASE + 586) +#define GD_MSG_RESET_BRICK_COMMIT_FORCE_REQ_RCVD (GLUSTERD_COMP_BASE + 587) /*! * @messageid @@ -4751,7 +4751,8 @@ * @recommendedaction * */ -#define GD_MSG_RESET_BRICK_CMD_FAIL (GLUSTERD_COMP_BASE + 587) +#define GD_MSG_RESET_BRICK_CMD_FAIL (GLUSTERD_COMP_BASE + 588) + /*------------*/ #define glfs_msg_end_x GLFS_MSGID_END, "Invalid: End of messages" #endif /* !_GLUSTERD_MESSAGES_H_ */ -- cgit