Commit f761d016 authored by Bobi Jam's avatar Bobi Jam Committed by Greg Kroah-Hartman

staging: lustre: lov: init LOV stripe type beforehand

When lu_object_alloc() reaches to LOV object init, we need initialize
its stripe type beforehand, so that if something wrong in the conf
buffer, the object chain need to be traversed to free what has been
allocated, with LOV object type be set as LLT_EMPTY, and when the LOV
part is reached, it won't panic without knowing what stripe type it
is.

This patch also improves debug messages in lsm_unpackmd_common(), and
does not return error if the LOV device is still processing config
log while trying to verify a layout buffer.
Signed-off-by: default avatarBobi Jam <bobijam.xu@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6744
Reviewed-on: http://review.whamcloud.com/15362Reviewed-by: default avatarJinshan Xiong <jinshan.xiong@intel.com>
Reviewed-by: default avatarFan Yong <fan.yong@intel.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cf9da270
...@@ -177,17 +177,21 @@ static int lsm_unpackmd_common(struct lov_obd *lov, ...@@ -177,17 +177,21 @@ static int lsm_unpackmd_common(struct lov_obd *lov,
if (lov_oinfo_is_dummy(loi)) if (lov_oinfo_is_dummy(loi))
continue; continue;
if (loi->loi_ost_idx >= lov->desc.ld_tgt_count) { if (loi->loi_ost_idx >= lov->desc.ld_tgt_count &&
CERROR("OST index %d more than OST count %d\n", !lov2obd(lov)->obd_process_conf) {
CERROR("%s: OST index %d more than OST count %d\n",
(char *)lov->desc.ld_uuid.uuid,
loi->loi_ost_idx, lov->desc.ld_tgt_count); loi->loi_ost_idx, lov->desc.ld_tgt_count);
lov_dump_lmm_v1(D_WARNING, lmm); lov_dump_lmm_v1(D_WARNING, lmm);
return -EINVAL; return -EINVAL;
} }
if (!lov->lov_tgts[loi->loi_ost_idx]) { if (!lov->lov_tgts[loi->loi_ost_idx]) {
CERROR("OST index %d missing\n", loi->loi_ost_idx); CERROR("%s: OST index %d missing\n",
(char *)lov->desc.ld_uuid.uuid,
loi->loi_ost_idx);
lov_dump_lmm_v1(D_WARNING, lmm); lov_dump_lmm_v1(D_WARNING, lmm);
return -EINVAL; continue;
} }
tgt_bytes = lov_tgt_maxbytes(lov->lov_tgts[loi->loi_ost_idx]); tgt_bytes = lov_tgt_maxbytes(lov->lov_tgts[loi->loi_ost_idx]);
......
...@@ -301,4 +301,9 @@ static inline bool lov_oinfo_is_dummy(const struct lov_oinfo *loi) ...@@ -301,4 +301,9 @@ static inline bool lov_oinfo_is_dummy(const struct lov_oinfo *loi)
return false; return false;
} }
static inline struct obd_device *lov2obd(const struct lov_obd *lov)
{
return container_of0(lov, struct obd_device, u.lov);
}
#endif #endif
...@@ -802,6 +802,7 @@ int lov_object_init(const struct lu_env *env, struct lu_object *obj, ...@@ -802,6 +802,7 @@ int lov_object_init(const struct lu_env *env, struct lu_object *obj,
init_waitqueue_head(&lov->lo_waitq); init_waitqueue_head(&lov->lo_waitq);
cl_object_page_init(lu2cl(obj), sizeof(struct lov_page)); cl_object_page_init(lu2cl(obj), sizeof(struct lov_page));
lov->lo_type = LLT_EMPTY;
if (cconf->u.coc_layout.lb_buf) { if (cconf->u.coc_layout.lb_buf) {
lsm = lov_unpackmd(dev->ld_lov, lsm = lov_unpackmd(dev->ld_lov,
cconf->u.coc_layout.lb_buf, cconf->u.coc_layout.lb_buf,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment