UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Bobi Jam <bobijam.xu@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6744
Reviewed-on: http://review.whamcloud.com/15362
Reviewed-by: Jinshan Xiong <jinshan.xiong@intel.com>
Reviewed-by: Fan Yong <fan.yong@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Bobi Jam 2016-11-10 12:30:34 -05:00 committed by Greg Kroah-Hartman
parent cf9da27049
commit f761d016b6
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/lustre/lustre/lov/lov_ea.c
View File

@ -177,17 +177,21 @@ static int lsm_unpackmd_common(struct lov_obd *lov,
if (lov_oinfo_is_dummy(loi))
continue;
if (loi->loi_ost_idx >= lov->desc.ld_tgt_count) {
CERROR("OST index %d more than OST count %d\n",
if (loi->loi_ost_idx >= lov->desc.ld_tgt_count &&
!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);
lov_dump_lmm_v1(D_WARNING, lmm);
return -EINVAL;
}
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);
return -EINVAL;
continue;
}
tgt_bytes = lov_tgt_maxbytes(lov->lov_tgts[loi->loi_ost_idx]);

5
drivers/staging/lustre/lustre/lov/lov_internal.h
View File

@ -301,4 +301,9 @@ static inline bool lov_oinfo_is_dummy(const struct lov_oinfo *loi)
return false;
}
static inline struct obd_device *lov2obd(const struct lov_obd *lov)
{
return container_of0(lov, struct obd_device, u.lov);
}
#endif

1
drivers/staging/lustre/lustre/lov/lov_object.c
View File

@ -802,6 +802,7 @@ int lov_object_init(const struct lu_env *env, struct lu_object *obj,
init_waitqueue_head(&lov->lo_waitq);
cl_object_page_init(lu2cl(obj), sizeof(struct lov_page));
lov->lo_type = LLT_EMPTY;
if (cconf->u.coc_layout.lb_buf) {
lsm = lov_unpackmd(dev->ld_lov,
cconf->u.coc_layout.lb_buf,