LU-3162 lov: Get the correct address of lmm_objects

[fs/lustre-release.git] / lustre / lov / lov_pack.c

diff --git a/lustre/lov/lov_pack.c b/lustre/lov/lov_pack.c
index 781c6b4..bc1e489 100644 (file)
--- 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.
  *
@@ -645,9 +643,8 @@ int lov_getstripe(struct obd_export *exp, struct lov_stripe_md *lsm,
         if (lum.lmm_magic == LOV_USER_MAGIC) {
                 /* User request for v1, we need skip lmm_pool_name */
                 if (lmmk->lmm_magic == LOV_MAGIC_V3) {
-                        memmove((char*)(&lmmk->lmm_stripe_count) +
-                                sizeof(lmmk->lmm_stripe_count),
-                                ((struct lov_mds_md_v3*)lmmk)->lmm_objects,
+                       memmove(((struct lov_mds_md_v1 *)lmmk)->lmm_objects,
+                               ((struct lov_mds_md_v3 *)lmmk)->lmm_objects,
                                 lmmk->lmm_stripe_count *
                                 sizeof(struct lov_ost_data_v1));
                         lmm_size -= LOV_MAXPOOLNAME;