1 files changed, 22 insertions, 96 deletions
diff --git a/xlators/experimental/jbr-client/src/jbr-messages.h b/xlators/experimental/jbr-client/src/jbr-messages.h
index 626c4fd3eaa..9f210184d81 100644
--- a/xlators/experimental/jbr-client/src/jbr-messages.h
+++ b/xlators/experimental/jbr-client/src/jbr-messages.h
@@ -13,101 +13,27 @@
 
 #include "glfs-message-id.h"
 
-/* NOTE: Rules for message additions
- * 1) Each instance of a message is _better_ left with a unique message ID, even
- *    if the message format is the same. Reasoning is that, if the message
- *    format needs to change in one instance, the other instances are not
- *    impacted or the new change does not change the ID of the instance being
- *    modified.
- * 2) Addition of a message,
- *       - Should increment the GLFS_NUM_MESSAGES
- *       - Append to the list of messages defined, towards the end
- *       - Retain macro naming as glfs_msg_X (for redability across developers)
- * NOTE: Rules for message format modifications
- * 3) Check acorss the code if the message ID macro in question is reused
- *    anywhere. If reused then then the modifications should ensure correctness
- *    everywhere, or needs a new message ID as (1) above was not adhered to. If
- *    not used anywhere, proceed with the required modification.
- * NOTE: Rules for message deletion
- * 4) Check (3) and if used anywhere else, then cannot be deleted. If not used
- *    anywhere, then can be deleted, but will leave a hole by design, as
- *    addition rules specify modification to the end of the list and not filling
- *    holes.
- */
-
-#define JBR_COMP_BASE           GLFS_MSGID_COMP_JBR
-#define GLFS_NUM_MESSAGES       1
-#define GLFS_MSGID_END          (JBR_COMP_BASE + GLFS_NUM_MESSAGES + 1)
-
-/*!
- * @messageid
- * @diagnosis
- * @recommendedaction
- */
-#define J_MSG_INIT_FAIL                      (JBR_COMP_BASE + 1)
-
-/*!
- * @messageid
- * @diagnosis
- * @recommendedaction
- */
-#define J_MSG_RETRY_MSG                      (JBR_COMP_BASE + 2)
-
-/*!
- * @messageid
- * @diagnosis
- * @recommendedaction
- */
-#define J_MSG_MEM_ERR                        (JBR_COMP_BASE + 3)
-
-/*!
- * @messageid
- * @diagnosis
- * @recommendedaction
- */
-#define J_MSG_DICT_FLR                       (JBR_COMP_BASE + 4)
-
-/*!
- * @messageid
- * @diagnosis
- * @recommendedaction
- */
-#define J_MSG_GENERIC                        (JBR_COMP_BASE + 5)
-
-/*!
- * @messageid
- * @diagnosis
- * @recommendedaction
- */
-#define J_MSG_INVALID                        (JBR_COMP_BASE + 6)
-
-/*!
- * @messageid
- * @diagnosis
- * @recommendedaction
- */
-#define J_MSG_NO_DATA                        (JBR_COMP_BASE + 7)
-
-/*!
- * @messageid
- * @diagnosis
- * @recommendedaction
- */
-#define J_MSG_SYS_CALL_FAILURE               (JBR_COMP_BASE + 8)
-
-/*!
- * @messageid
- * @diagnosis
- * @recommendedaction
- */
-#define J_MSG_QUORUM_NOT_MET                 (JBR_COMP_BASE + 9)
-
-/*!
- * @messageid
- * @diagnosis
- * @recommendedaction
- */
-#define J_MSG_LOCK_FAILURE                  (JBR_COMP_BASE + 10)
-
+/* To add new message IDs, append new identifiers at the end of the list.
+ *
+ * Never remove a message ID. If it's not used anymore, you can rename it or
+ * leave it as it is, but not delete it. This is to prevent reutilization of
+ * IDs by other messages.
+ *
+ * The component name must match one of the entries defined in
+ * glfs-message-id.h.
+ */
+
+GLFS_MSGID(JBR,
+        J_MSG_INIT_FAIL,
+        J_MSG_RETRY_MSG,
+        J_MSG_MEM_ERR,
+        J_MSG_DICT_FLR,
+        J_MSG_GENERIC,
+        J_MSG_INVALID,
+        J_MSG_NO_DATA,
+        J_MSG_SYS_CALL_FAILURE,
+        J_MSG_QUORUM_NOT_MET,
+        J_MSG_LOCK_FAILURE
+);
 
 #endif /* _JBR_MESSAGES_H_ */