* GPL HEADER END
*/
/*
- * Copyright (c) 2013, 2014, Intel Corporation.
+ * Copyright (c) 2013, 2015, Intel Corporation.
*/
/*
* lustre/lfsck/lfsck_engine.c
iops->put(env, di);
}
-static int lfsck_update_lma(const struct lu_env *env,
- struct lfsck_instance *lfsck, struct dt_object *obj)
-{
- struct lfsck_thread_info *info = lfsck_env_info(env);
- struct lfsck_bookmark *bk = &lfsck->li_bookmark_ram;
- struct dt_device *dev = lfsck_obj2dev(obj);
- struct lustre_mdt_attrs *lma = &info->lti_lma;
- struct lu_buf *buf;
- struct thandle *th;
- int fl;
- int rc;
- ENTRY;
-
- if (bk->lb_param & LPF_DRYRUN)
- RETURN(0);
-
- buf = lfsck_buf_get(env, info->lti_lma_old, LMA_OLD_SIZE);
- rc = dt_xattr_get(env, obj, buf, XATTR_NAME_LMA);
- if (rc < 0) {
- if (rc != -ENODATA)
- RETURN(rc);
-
- fl = LU_XATTR_CREATE;
- lustre_lma_init(lma, lfsck_dto2fid(obj), LMAC_FID_ON_OST, 0);
- } else {
- if (rc != LMA_OLD_SIZE && rc != sizeof(struct lustre_mdt_attrs))
- RETURN(-EINVAL);
-
- fl = LU_XATTR_REPLACE;
- lustre_lma_swab(lma);
- lustre_lma_init(lma, lfsck_dto2fid(obj),
- lma->lma_compat | LMAC_FID_ON_OST,
- lma->lma_incompat);
- }
- lustre_lma_swab(lma);
-
- th = dt_trans_create(env, dev);
- if (IS_ERR(th))
- RETURN(PTR_ERR(th));
-
- buf = lfsck_buf_get(env, lma, sizeof(*lma));
- rc = dt_declare_xattr_set(env, obj, buf, XATTR_NAME_LMA, fl, th);
- if (rc != 0)
- GOTO(stop, rc);
-
- rc = dt_trans_start_local(env, dev, th);
- if (rc != 0)
- GOTO(stop, rc);
-
- rc = dt_xattr_set(env, obj, buf, XATTR_NAME_LMA, fl, th);
-
- GOTO(stop, rc);
-
-stop:
- dt_trans_stop(env, dev, th);
- return rc;
-}
-
static int lfsck_parent_fid(const struct lu_env *env, struct dt_object *obj,
struct lu_fid *fid)
{
do {
struct dt_object *target;
- bool update_lma = false;
if (lfsck->li_di_dir != NULL) {
rc = lfsck_master_dir_engine(env, lfsck);
LASSERT(!lfsck->li_master);
- /* It is an old format device, update the LMA. */
if (idx != idx1) {
struct ost_id *oi = &info->lti_oi;
+ if (unlikely(idx1 != 0)) {
+ CDEBUG(D_LFSCK, "%s: invalid IDIF "DFID
+ ", not match device index %u\n",
+ lfsck_lfsck2name(lfsck),
+ PFID(fid), idx);
+
+ goto checkpoint;
+ }
+
+ /* rebuild the IDIF with index to
+ * avoid double instances for the
+ * same object. */
fid_to_ostid(fid, oi);
ostid_to_fid(fid, oi, idx);
- update_lma = true;
}
} else if (!fid_is_norm(fid) && !fid_is_igif(fid) &&
!fid_is_last_id(fid) &&
goto checkpoint;
}
- if (dt_object_exists(target)) {
- if (update_lma) {
- rc = lfsck_update_lma(env, lfsck, target);
- if (rc != 0)
- CDEBUG(D_LFSCK, "%s: fail to update "
- "LMA for "DFID": rc = %d\n",
- lfsck_lfsck2name(lfsck),
- PFID(lfsck_dto2fid(target)), rc);
- }
- if (rc == 0)
- rc = lfsck_exec_oit(env, lfsck, target);
- }
+ if (dt_object_exists(target))
+ rc = lfsck_exec_oit(env, lfsck, target);
+
lfsck_object_put(env, target);
if (rc != 0 && bk->lb_param & LPF_FAILOUT)
RETURN(rc);
int rc;
ENTRY;
+ /* There will be some objects verification during the LFSCK start,
+ * such as the subsequent lfsck_verify_lpf(). Trigger low layer OI
+ * OI scrub before that to handle the potential inconsistence. */
+ oit_di = oit_iops->init(env, oit_obj, lfsck->li_args_oit);
+ if (IS_ERR(oit_di)) {
+ rc = PTR_ERR(oit_di);
+ CDEBUG(D_LFSCK, "%s: master engine fail to init iteration: "
+ "rc = %d\n", lfsck_lfsck2name(lfsck), rc);
+
+ GOTO(fini_args, rc);
+ }
+
if (lfsck->li_master &&
(!list_empty(&lfsck->li_list_scan) ||
!list_empty(&lfsck->li_list_double_scan))) {
lfsck_lfsck2name(lfsck), rc);
}
- oit_di = oit_iops->init(env, oit_obj, lfsck->li_args_oit);
- if (IS_ERR(oit_di)) {
- rc = PTR_ERR(oit_di);
- CDEBUG(D_LFSCK, "%s: master engine fail to init iteration: "
- "rc = %d\n", lfsck_lfsck2name(lfsck), rc);
-
- GOTO(fini_args, rc);
- }
-
spin_lock(&lfsck->li_lock);
lfsck->li_di_oit = oit_di;
spin_unlock(&lfsck->li_lock);
memset(lr, 0, sizeof(*lr));
lr->lr_event = LE_QUERY;
lr->lr_active = com->lc_type;
+
+ memset(laia, 0, sizeof(*laia));
laia->laia_com = com;
laia->laia_lr = lr;
- laia->laia_shared = 0;
if (!list_empty(&lad->lad_mdt_phase1_list)) {
ltds = &lfsck->li_mdt_descs;
lr->lr_index = lfsck_dev_idx(lfsck);
lr->lr_active = com->lc_type;
+
+ memset(laia, 0, sizeof(*laia));
laia->laia_com = com;
laia->laia_lr = lr;
- laia->laia_shared = 0;
switch (lr->lr_event) {
case LE_START:
LASSERT(ltd != NULL);
laia->laia_ltd = ltd;
- ltd->ltd_layout_done = 0;
- ltd->ltd_synced_failures = 0;
rc = lfsck_async_request(env, ltd->ltd_exp, lr, set,
lfsck_async_interpret_common,
laia, LFSCK_NOTIFY);
}
spin_lock(&lad->lad_lock);
+ lad->lad_task = current;
thread_set_flags(athread, SVC_RUNNING);
spin_unlock(&lad->lad_lock);
wake_up_all(&mthread->t_ctl_waitq);
lad->lad_assistant_status = (rc1 != 0 ? rc1 : rc);
thread_set_flags(athread, SVC_STOPPED);
wake_up_all(&mthread->t_ctl_waitq);
+ lad->lad_task = NULL;
spin_unlock(&lad->lad_lock);
CDEBUG(D_LFSCK, "%s: %s LFSCK assistant thread exit: rc = %d\n",
git://git.whamcloud.com / fs / lustre-release.git / blobdiff