if (CFS_FAIL_TIMEOUT(OBD_FAIL_LFSCK_DELAY2, cfs_fail_val) &&
unlikely(!thread_is_running(thread))) {
CDEBUG(D_LFSCK, "%s: scan dir exit for engine stop, "
- "parent "DFID", cookie "LPX64"\n",
+ "parent "DFID", cookie %#llx\n",
lfsck_lfsck2name(lfsck),
PFID(lfsck_dto2fid(dir)), lfsck->li_cookie_dir);
if (rc != 0) {
CDEBUG(D_LFSCK, "%s: scan dir failed at rec(), "
- "parent "DFID", cookie "LPX64": rc = %d\n",
+ "parent "DFID", cookie %#llx: rc = %d\n",
lfsck_lfsck2name(lfsck),
PFID(lfsck_dto2fid(dir)),
lfsck->li_cookie_dir, rc);
lfsck_control_speed(lfsck);
if (unlikely(!thread_is_running(thread))) {
CDEBUG(D_LFSCK, "%s: scan dir exit for engine stop, "
- "parent "DFID", cookie "LPX64"\n",
+ "parent "DFID", cookie %#llx\n",
lfsck_lfsck2name(lfsck),
PFID(lfsck_dto2fid(dir)),
lfsck->li_cookie_dir);
if (CFS_FAIL_TIMEOUT(OBD_FAIL_LFSCK_DELAY1, cfs_fail_val) &&
unlikely(!thread_is_running(thread))) {
CDEBUG(D_LFSCK, "%s: OIT scan exit for engine stop, "
- "cookie "LPU64"\n",
+ "cookie %llu\n",
lfsck_lfsck2name(lfsck), iops->store(env, di));
RETURN(0);
target = lfsck_object_find_bottom(env, lfsck, fid);
if (IS_ERR(target)) {
CDEBUG(D_LFSCK, "%s: OIT scan failed at find target "
- DFID", cookie "LPU64": rc = %d\n",
+ DFID", cookie %llu: rc = %d\n",
lfsck_lfsck2name(lfsck), PFID(fid),
iops->store(env, di), rc);
lfsck_fail(env, lfsck, true);
lfsck->li_current_oit_processed = 0;
else
CDEBUG(D_LFSCK, "%s oit engine fail to locate next at "
- LPU64 ": rc = %d\n", lfsck_lfsck2name(lfsck),
+ "%llu: rc = %d\n", lfsck_lfsck2name(lfsck),
iops->store(env, di), rc);
if (unlikely(!thread_is_running(thread))) {
CDEBUG(D_LFSCK, "%s: OIT scan exit for engine stop, "
- "cookie "LPU64"\n", lfsck_lfsck2name(lfsck),
+ "cookie %llu\n", lfsck_lfsck2name(lfsck),
iops->store(env, di));
RETURN(0);
}
GOTO(fini_oit, rc);
CDEBUG(D_LFSCK, "LFSCK entry: oit_flags = %#x, dir_flags = %#x, "
- "oit_cookie = "LPU64", dir_cookie = "LPX64", parent = "DFID
+ "oit_cookie = %llu, dir_cookie = %#llx, parent = "DFID
", pid = %d\n", lfsck->li_args_oit, lfsck->li_args_dir,
lfsck->li_pos_checkpoint.lp_oit_cookie,
lfsck->li_pos_checkpoint.lp_dir_cookie,
lfsck_pos_fill(env, lfsck, &lfsck->li_pos_checkpoint, false);
CDEBUG(D_LFSCK, "LFSCK exit: oit_flags = %#x, dir_flags = %#x, "
- "oit_cookie = "LPU64", dir_cookie = "LPX64", parent = "DFID
+ "oit_cookie = %llu, dir_cookie = %#llx, parent = "DFID
", pid = %d, rc = %d\n", lfsck->li_args_oit, lfsck->li_args_dir,
lfsck->li_pos_checkpoint.lp_oit_cookie,
lfsck->li_pos_checkpoint.lp_dir_cookie,
if (unlikely(lad->lad_exit ||
!thread_is_running(mthread)))
- GOTO(cleanup1, rc = lad->lad_post_result);
+ GOTO(cleanup, rc = lad->lad_post_result);
lar = list_entry(lad->lad_req_list.next,
struct lfsck_assistant_req,
lao->la_req_fini(env, lar);
if (rc < 0 && bk->lb_param & LPF_FAILOUT)
- GOTO(cleanup1, rc);
+ GOTO(cleanup, rc);
}
l_wait_event(athread->t_ctl_waitq,
&lwi);
if (unlikely(lad->lad_exit))
- GOTO(cleanup1, rc = lad->lad_post_result);
+ GOTO(cleanup, rc = lad->lad_post_result);
if (!list_empty(&lad->lad_req_list))
continue;
lfsck_lfsck2name(lfsck), lad->lad_name);
if (unlikely(lad->lad_exit))
- GOTO(cleanup1, rc = lad->lad_post_result);
+ GOTO(cleanup, rc = lad->lad_post_result);
lad->lad_to_post = 0;
LASSERT(lad->lad_post_result > 0);
lfsck_lfsck2name(lfsck), rc2);
if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_NO_DOUBLESCAN))
- GOTO(cleanup2, rc = 0);
+ GOTO(cleanup, rc = 0);
while (lad->lad_in_double_scan) {
rc = lfsck_assistant_query_others(env, com);
goto p2_next;
if (rc < 0)
- GOTO(cleanup2, rc);
+ GOTO(cleanup, rc);
/* Pull LFSCK status on related targets once
* per 30 seconds if we are not notified. */
if (unlikely(lad->lad_exit ||
!thread_is_running(mthread)))
- GOTO(cleanup2, rc = 0);
+ GOTO(cleanup, rc = 0);
if (rc == -ETIMEDOUT)
continue;
if (rc < 0)
- GOTO(cleanup2, rc);
+ GOTO(cleanup, rc);
p2_next:
rc = lao->la_handler_p2(env, com);
if (rc != 0)
- GOTO(cleanup2, rc);
+ GOTO(cleanup, rc);
if (unlikely(lad->lad_exit ||
!thread_is_running(mthread)))
- GOTO(cleanup2, rc = 0);
+ GOTO(cleanup, rc = 0);
}
}
}
-cleanup1:
+cleanup:
/* Cleanup the unfinished requests. */
spin_lock(&lad->lad_lock);
if (rc < 0)
if (lad->lad_exit && lad->lad_post_result <= 0)
lao->la_fill_pos(env, com, &lfsck->li_pos_checkpoint);
+ thread_set_flags(athread, SVC_STOPPING);
while (!list_empty(&lad->lad_req_list)) {
lar = list_entry(lad->lad_req_list.next,
struct lfsck_assistant_req,
LASSERTF(lad->lad_prefetched == 0, "unmatched prefeteched objs %d\n",
lad->lad_prefetched);
-cleanup2:
memset(lr, 0, sizeof(*lr));
if (rc > 0) {
lr->lr_event = LE_PHASE2_DONE;