struct lfsck_thread_info *info = lfsck_env_info(env);
struct lu_fid *fid = &info->lti_fid;
struct lu_seq_range *range = &info->lti_range;
+ struct lu_attr *la = &info->lti_la;
struct seq_server_site *ss = lfsck_dev_site(lfsck);
__u32 idx = lfsck_dev_idx(lfsck);
int depth = 0;
if (list_empty(&lfsck->li_list_dir) || !S_ISDIR(lfsck_object_type(obj)))
return 0;
+ *fid = *lfsck_dto2fid(obj);
+ rc = dt_attr_get(env, obj, la);
+ if (unlikely(rc || (la->la_valid & LA_FLAGS &&
+ la->la_flags & LUSTRE_ORPHAN_FL))) {
+ /* Orphan directory is empty, does not need scan. */
+ CDEBUG(D_INFO,
+ "%s: skip orphan dir "DFID", %llx/%x: rc = %d\n",
+ lfsck_lfsck2name(lfsck), PFID(fid),
+ la->la_valid, la->la_flags, rc);
+
+ return rc;
+ }
+
LASSERT(ss != NULL);
- *fid = *lfsck_dto2fid(obj);
while (1) {
/* Global /ROOT is visible. */
if (unlikely(lu_fid_eq(fid, &lfsck->li_global_root_fid)))
if (fid_is_norm(fid))
return 1;
+ /* Only true after "obj = NULL" set below */
if (obj == NULL) {
obj = lfsck_object_find_bottom(env, lfsck, fid);
if (IS_ERR(obj))
GOTO(out, rc = 0);
}
- dt_read_lock(env, obj, MOR_TGT_CHILD);
+ dt_read_lock(env, obj, DT_TGT_CHILD);
if (unlikely(lfsck_is_dead_obj(obj))) {
dt_read_unlock(env, obj);
LASSERT(lfsck->li_obj_dir == NULL);
LASSERT(lfsck->li_lmv == NULL);
- rc = lfsck_read_stripe_lmv(env, obj, lmv);
+ rc = lfsck_read_stripe_lmv(env, lfsck, obj, lmv);
if (rc == -ENODATA) {
lfsck->li_obj_dir = lfsck_object_get(obj);
goto checkpoint;
}
- if (dt_object_exists(target)) {
- struct lu_attr la = { .la_valid = 0 };
-
- rc = dt_attr_get(env, target, &la);
- if (likely(!rc && (!(la.la_valid & LA_FLAGS) ||
- !(la.la_flags & LUSTRE_ORPHAN_FL))))
- rc = lfsck_exec_oit(env, lfsck, target);
- else
- CDEBUG(D_INFO,
- "%s: orphan "DFID", %llx/%x: rc = %d\n",
- lfsck_lfsck2name(lfsck), PFID(fid),
- la.la_valid, la.la_flags, rc);
- }
+ 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)
while (!list_empty(&lad->lad_req_list)) {
bool wakeup = false;
- if (unlikely(lad->lad_exit ||
+ if (unlikely(test_bit(LAD_EXIT, &lad->lad_flags) ||
!thread_is_running(mthread)))
GOTO(cleanup, rc = lad->lad_post_result);
l_wait_event(athread->t_ctl_waitq,
!lfsck_assistant_req_empty(lad) ||
- lad->lad_exit ||
- lad->lad_to_post ||
- lad->lad_to_double_scan,
+ test_bit(LAD_EXIT, &lad->lad_flags) ||
+ test_bit(LAD_TO_POST, &lad->lad_flags) ||
+ test_bit(LAD_TO_DOUBLE_SCAN, &lad->lad_flags),
&lwi);
- if (unlikely(lad->lad_exit))
+ if (unlikely(test_bit(LAD_EXIT, &lad->lad_flags)))
GOTO(cleanup, rc = lad->lad_post_result);
if (!list_empty(&lad->lad_req_list))
continue;
- if (lad->lad_to_post) {
+ if (test_bit(LAD_TO_POST, &lad->lad_flags)) {
CDEBUG(D_LFSCK, "%s: %s LFSCK assistant thread post\n",
lfsck_lfsck2name(lfsck), lad->lad_name);
- if (unlikely(lad->lad_exit))
+ if (unlikely(test_bit(LAD_EXIT, &lad->lad_flags)))
GOTO(cleanup, rc = lad->lad_post_result);
- lad->lad_to_post = 0;
+ clear_bit(LAD_TO_POST, &lad->lad_flags);
LASSERT(lad->lad_post_result > 0);
/* Wakeup the master engine to go ahead. */
lad->lad_name, rc);
}
- if (lad->lad_to_double_scan) {
- lad->lad_to_double_scan = 0;
+ if (test_bit(LAD_TO_DOUBLE_SCAN, &lad->lad_flags)) {
+ clear_bit(LAD_TO_DOUBLE_SCAN, &lad->lad_flags);
atomic_inc(&lfsck->li_double_scan_count);
- lad->lad_in_double_scan = 1;
+ set_bit(LAD_IN_DOUBLE_SCAN, &lad->lad_flags);
wake_up_all(&mthread->t_ctl_waitq);
com->lc_new_checked = 0;
if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_NO_DOUBLESCAN))
GOTO(cleanup, rc = 0);
- while (lad->lad_in_double_scan) {
+ while (test_bit(LAD_IN_DOUBLE_SCAN, &lad->lad_flags)) {
rc = lfsck_assistant_query_others(env, com);
if (lfsck_phase2_next_ready(lad))
goto p2_next;
NULL, NULL);
rc = l_wait_event(athread->t_ctl_waitq,
lfsck_phase2_next_ready(lad) ||
- lad->lad_exit ||
+ test_bit(LAD_EXIT, &lad->lad_flags) ||
!thread_is_running(mthread),
&lwi);
- if (unlikely(lad->lad_exit ||
- !thread_is_running(mthread)))
+ if (unlikely(
+ test_bit(LAD_EXIT, &lad->lad_flags) ||
+ !thread_is_running(mthread)))
GOTO(cleanup, rc = 0);
if (rc == -ETIMEDOUT)
if (rc != 0)
GOTO(cleanup, rc);
- if (unlikely(lad->lad_exit ||
- !thread_is_running(mthread)))
+ if (unlikely(
+ test_bit(LAD_EXIT, &lad->lad_flags) ||
+ !thread_is_running(mthread)))
GOTO(cleanup, rc = 0);
}
}
if (rc < 0)
lad->lad_assistant_status = rc;
- if (lad->lad_exit && lad->lad_post_result <= 0)
+ if (test_bit(LAD_EXIT, &lad->lad_flags) && lad->lad_post_result <= 0)
lao->la_fill_pos(env, com, &lfsck->li_pos_checkpoint);
thread_set_flags(athread, SVC_STOPPING);
/* Under force exit case, some requests may be just freed without
* verification, those objects should be re-handled when next run.
* So not update the on-disk trace file under such case. */
- if (lad->lad_in_double_scan) {
- if (!lad->lad_exit)
+ if (test_bit(LAD_IN_DOUBLE_SCAN, &lad->lad_flags)) {
+ if (!test_bit(LAD_EXIT, &lad->lad_flags))
rc1 = lao->la_double_scan_result(env, com, rc);
CDEBUG(D_LFSCK, "%s: LFSCK assistant phase2 scan "
}
fini:
- if (lad->lad_in_double_scan)
+ if (test_bit(LAD_IN_DOUBLE_SCAN, &lad->lad_flags))
atomic_dec(&lfsck->li_double_scan_count);
spin_lock(&lad->lad_lock);