LU-9771 lov: pack lsm_flags from layout

Pack lsm_flags from compount layout.

Signed-off-by: Jinshan Xiong <jinshan.xiong@intel.com>
Change-Id: I39cb0fe319c1665ef9d12ff704931c4583d730ff
Reviewed-on: https://review.whamcloud.com/29081
Reviewed-by: Bobi Jam <bobijam@hotmail.com>
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Lai Siyao <lai.siyao@intel.com>

diff --git a/lustre/lov/lov_ea.c b/lustre/lov/lov_ea.c
index 8025d1c..893659c 100644 (file)
--- a/lustre/lov/lov_ea.c
+++ b/lustre/lov/lov_ea.c
@@ -441,6 +441,7 @@ lsm_unpackmd_comp_md_v1(struct lov_obd *lov, void *buf, size_t buf_size)
        lsm->lsm_magic = le32_to_cpu(lcm->lcm_magic);
        lsm->lsm_layout_gen = le32_to_cpu(lcm->lcm_layout_gen);
        lsm->lsm_entry_count = entry_count;
+       lsm->lsm_flags = le16_to_cpu(lcm->lcm_flags);
        lsm->lsm_is_released = true;
        lsm->lsm_maxbytes = LLONG_MIN;
 

diff --git a/lustre/lov/lov_internal.h b/lustre/lov/lov_internal.h
index a081b33..6142e7c 100644 (file)
--- a/lustre/lov/lov_internal.h
+++ b/lustre/lov/lov_internal.h
@@ -80,8 +80,9 @@ struct lov_stripe_md {
        struct ost_id   lsm_oi;
        u32             lsm_magic;
        u32             lsm_layout_gen;
-       u32             lsm_entry_count;
+       u16             lsm_flags;
        bool            lsm_is_released;
+       u32             lsm_entry_count;
        struct lov_stripe_md_entry *lsm_entries[];
 };
 

diff --git a/lustre/lov/lov_pack.c b/lustre/lov/lov_pack.c
index fd07e4a..3796522 100644 (file)
--- a/lustre/lov/lov_pack.c
+++ b/lustre/lov/lov_pack.c
@@ -206,6 +206,7 @@ ssize_t lov_lsm_pack(const struct lov_stripe_md *lsm, void *buf,
        lcmv1->lcm_magic = cpu_to_le32(lsm->lsm_magic);
        lcmv1->lcm_size = cpu_to_le32(lmm_size);
        lcmv1->lcm_layout_gen = cpu_to_le32(lsm->lsm_layout_gen);
+       lcmv1->lcm_flags = cpu_to_le16(lsm->lsm_flags);
        lcmv1->lcm_entry_count = cpu_to_le16(lsm->lsm_entry_count);
 
        offset = sizeof(*lcmv1) + sizeof(*lcme) * lsm->lsm_entry_count;