From f5c5d24d9e6b07a34bc11baea840811df9a1d4e8 Mon Sep 17 00:00:00 2001 From: "John L. Hammond" Date: Wed, 8 May 2013 12:54:04 -0500 Subject: [PATCH] LU-3297 lov: convert magic to host-endian in lov_dump_lmm() In lov_dump_lmm(), convert the lmm_magic from little-endian to host-endian byte order before the switch statement, as the other lov_dump_xxx() and lov_verify_xxx() functions already do. Remove the unused macro LMM_ASSERT(). Signed-off-by: John L. Hammond Change-Id: Icfa52f3043aaa13b0d0cc34f5be2f59792c3787e Reviewed-on: http://review.whamcloud.com/6290 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Li Wei Reviewed-by: Andreas Dilger --- lustre/lov/lov_pack.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/lustre/lov/lov_pack.c b/lustre/lov/lov_pack.c index 781c6b4..c70f427 100644 --- a/lustre/lov/lov_pack.c +++ b/lustre/lov/lov_pack.c @@ -106,26 +106,24 @@ void lov_dump_lmm_v3(int level, struct lov_mds_md_v3 *lmm) void lov_dump_lmm(int level, void *lmm) { - int magic; - - magic = ((struct lov_mds_md_v1 *)(lmm))->lmm_magic; - switch (magic) { - case LOV_MAGIC_V1: - return lov_dump_lmm_v1(level, (struct lov_mds_md_v1 *)(lmm)); - case LOV_MAGIC_V3: - return lov_dump_lmm_v3(level, (struct lov_mds_md_v3 *)(lmm)); - default: - CERROR("Cannot recognize lmm_magic %x", magic); - } - return; + int magic; + + magic = le32_to_cpu(((struct lov_mds_md *)lmm)->lmm_magic); + switch (magic) { + case LOV_MAGIC_V1: + lov_dump_lmm_v1(level, (struct lov_mds_md_v1 *)lmm); + break; + case LOV_MAGIC_V3: + lov_dump_lmm_v3(level, (struct lov_mds_md_v3 *)lmm); + break; + default: + CDEBUG(level, "unrecognized lmm_magic %x, assuming %x\n", + magic, LOV_MAGIC_V1); + lov_dump_lmm_common(level, lmm); + break; + } } -#define LMM_ASSERT(test) \ -do { \ - if (!(test)) lov_dump_lmm(D_ERROR, lmm); \ - LASSERT(test); /* so we know what assertion failed */ \ -} while(0) - /* Pack LOV object metadata for disk storage. It is packed in LE byte * order and is opaque to the networking layer. * -- 1.8.3.1