From 61b3e8d6f4bc7c5e0bccfb09ab6463533c30f863 Mon Sep 17 00:00:00 2001
From: yangsheng <yangsheng>
Date: Wed, 3 Sep 2008 08:58:03 +0000
Subject: [PATCH] Branch b1_6 b=<bug> i=adilger, johann
Swab cfg_marker along with lcfg.
---
lustre/include/lustre/lustre_idl.h | 2 ++
lustre/obdclass/llog_swab.c | 14 ++++++++++++++
lustre/obdclass/obd_config.c | 8 ++++++--
3 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h
index ba2ca51ef6..8202adea5e 100644
--- a/lustre/include/lustre/lustre_idl.h
+++ b/lustre/include/lustre/lustre_idl.h
@@ -1243,6 +1243,8 @@ struct cfg_marker {
char cm_comment[MTI_NAME_MAXLEN];
};
+extern void lustre_swab_cfg_marker(struct cfg_marker *marker);
+
/*
* Opcodes for multiple servers.
*/
diff --git a/lustre/obdclass/llog_swab.c b/lustre/obdclass/llog_swab.c
index 8636e8518a..d361dcc6a5 100644
--- a/lustre/obdclass/llog_swab.c
+++ b/lustre/obdclass/llog_swab.c
@@ -265,3 +265,17 @@ void lustre_swab_lustre_cfg(struct lustre_cfg *lcfg)
return;
}
EXPORT_SYMBOL(lustre_swab_lustre_cfg);
+
+void lustre_swab_cfg_marker(struct cfg_marker *marker)
+{
+ int i;
+ ENTRY;
+
+ __swab32s(&marker->cm_step);
+ __swab32s(&marker->cm_flags);
+ __swab32s(&marker->cm_vers);
+
+ EXIT;
+ return;
+}
+EXPORT_SYMBOL(lustre_swab_cfg_marker);
diff --git a/lustre/obdclass/obd_config.c b/lustre/obdclass/obd_config.c
index 1cea0a0e1d..980d34459e 100644
--- a/lustre/obdclass/obd_config.c
+++ b/lustre/obdclass/obd_config.c
@@ -965,11 +965,13 @@ static int class_config_llog_handler(struct llog_handle * handle,
struct lustre_cfg_bufs bufs;
char *inst_name = NULL;
int inst_len = 0;
- int inst = 0;
+ int inst = 0, swab = 0;
lcfg = (struct lustre_cfg *)cfg_buf;
- if (lcfg->lcfg_version == __swab32(LUSTRE_CFG_VERSION))
+ if (lcfg->lcfg_version == __swab32(LUSTRE_CFG_VERSION)) {
lustre_swab_lustre_cfg(lcfg);
+ swab = 1;
+ }
rc = lustre_cfg_sanity_check(cfg_buf, cfg_len);
if (rc)
@@ -978,6 +980,8 @@ static int class_config_llog_handler(struct llog_handle * handle,
/* Figure out config state info */
if (lcfg->lcfg_command == LCFG_MARKER) {
struct cfg_marker *marker = lustre_cfg_buf(lcfg, 1);
+ if (swab)
+ lustre_swab_cfg_marker(marker);
CDEBUG(D_CONFIG, "Marker, inst_flg=%#x mark_flg=%#x\n",
clli->cfg_flags, marker->cm_flags);
if (marker->cm_flags & CM_START) {
--
GitLab