staging/lustre/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().

Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3297
Lustre-change: http://review.whamcloud.com/6290
Signed-off-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Li Wei <wei.g.li@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/lov/lov_pack.c b/drivers/staging/lustre/lustre/lov/lov_pack.c
index ec6f6e0572ae906fd43ce7f3530449cd0e1eee62..27ed27e6fa6a1d9eefbf6a6b2e90af1edaea026b 100644 (file)
--- a/drivers/staging/lustre/lustre/lov/lov_pack.c
+++ b/drivers/staging/lustre/lustre/lov/lov_pack.c
@@ -105,24 +105,22 @@ void lov_dump_lmm(int level, void *lmm)
 {
        int magic;
 
-       magic = ((struct lov_mds_md_v1 *)(lmm))->lmm_magic;
+       magic = le32_to_cpu(((struct lov_mds_md *)lmm)->lmm_magic);
        switch (magic) {
        case LOV_MAGIC_V1:
-               return lov_dump_lmm_v1(level, (struct lov_mds_md_v1 *)(lmm));
+               lov_dump_lmm_v1(level, (struct lov_mds_md_v1 *)lmm);
+               break;
        case LOV_MAGIC_V3:
-               return lov_dump_lmm_v3(level, (struct lov_mds_md_v3 *)(lmm));
+               lov_dump_lmm_v3(level, (struct lov_mds_md_v3 *)lmm);
+               break;
        default:
-               CERROR("Cannot recognize lmm_magic %x", magic);
+               CDEBUG(level, "unrecognized lmm_magic %x, assuming %x\n",
+                      magic, LOV_MAGIC_V1);
+               lov_dump_lmm_common(level, lmm);
+               break;
        }
-       return;
 }
 
-#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.
  *