From a119255d9a340e716672fcea315c7e90ec1d5de5 Mon Sep 17 00:00:00 2001
From: vitaly <vitaly>
Date: Fri, 15 Jun 2007 16:47:06 +0000
Subject: [PATCH] Branch b1_6 b=12731 i=adilger i=green
ASSERTION(offset < LUSTRE_MAX_OPCODES) fix
---
lustre/include/lustre/lustre_idl.h | 1 +
lustre/ptlrpc/lproc_ptlrpc.c | 5 +++++
lustre/ptlrpc/ptlrpc_internal.h | 10 +++++++++-
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h
index 38acc4de7d..980f5884b8 100644
--- a/lustre/include/lustre/lustre_idl.h
+++ b/lustre/include/lustre/lustre_idl.h
@@ -1079,6 +1079,7 @@ typedef enum {
MGS_TARGET_DEL,
MGS_LAST_OPC
} mgs_cmd_t;
+#define MGS_FIRST_OPC MGS_CONNECT
/* We pass this info to the MGS so it can write config logs */
#define MTI_NAME_MAXLEN 64
diff --git a/lustre/ptlrpc/lproc_ptlrpc.c b/lustre/ptlrpc/lproc_ptlrpc.c
index fd4ee1a058..67247f0dd5 100644
--- a/lustre/ptlrpc/lproc_ptlrpc.c
+++ b/lustre/ptlrpc/lproc_ptlrpc.c
@@ -85,6 +85,11 @@ struct ll_rpc_opcode {
{ LDLM_BL_CALLBACK, "ldlm_bl_callback" },
{ LDLM_CP_CALLBACK, "ldlm_cp_callback" },
{ LDLM_GL_CALLBACK, "ldlm_gl_callback" },
+ { MGS_CONNECT, "mgs_connect" },
+ { MGS_DISCONNECT, "mgs_disconnect" },
+ { MGS_EXCEPTION, "mgs_exception" },
+ { MGS_TARGET_REG, "mgs_target_reg" },
+ { MGS_TARGET_DEL, "mgs_target_del" },
{ OBD_PING, "obd_ping" },
{ OBD_LOG_CANCEL, "llog_origin_handle_cancel"},
};
diff --git a/lustre/ptlrpc/ptlrpc_internal.h b/lustre/ptlrpc/ptlrpc_internal.h
index 2f886ef130..a9a9a8d1c9 100644
--- a/lustre/ptlrpc/ptlrpc_internal.h
+++ b/lustre/ptlrpc/ptlrpc_internal.h
@@ -79,9 +79,16 @@ static inline int opcode_offset(__u32 opc) {
return (opc - LDLM_FIRST_OPC +
(MDS_LAST_OPC - MDS_FIRST_OPC) +
(OST_LAST_OPC - OST_FIRST_OPC));
+ } else if (opc < MGS_LAST_OPC) {
+ /* MGS Opcode */
+ return (opc - MGS_FIRST_OPC +
+ (LDLM_LAST_OPC - LDLM_FIRST_OPC) +
+ (MDS_LAST_OPC - MDS_FIRST_OPC) +
+ (OST_LAST_OPC - OST_FIRST_OPC));
} else if (opc < OBD_LAST_OPC) {
/* OBD Ping */
return (opc - OBD_FIRST_OPC +
+ (MGS_LAST_OPC - MGS_FIRST_OPC) +
(LDLM_LAST_OPC - LDLM_FIRST_OPC) +
(MDS_LAST_OPC - MDS_FIRST_OPC) +
(OST_LAST_OPC - OST_FIRST_OPC));
@@ -94,7 +101,8 @@ static inline int opcode_offset(__u32 opc) {
#define LUSTRE_MAX_OPCODES ((LDLM_LAST_OPC - LDLM_FIRST_OPC) + \
(MDS_LAST_OPC - MDS_FIRST_OPC) + \
(OST_LAST_OPC - OST_FIRST_OPC) + \
- (OBD_LAST_OPC - OBD_FIRST_OPC))
+ (OBD_LAST_OPC - OBD_FIRST_OPC) + \
+ (MGS_LAST_OPC - MGS_FIRST_OPC))
enum {
PTLRPC_REQWAIT_CNTR = 0,
--
GitLab