X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flfsck%2Flfsck_engine.c;h=f9c65b8c08cba037e19d5dcaeedc7b1782aadc45;hb=d525ad4bd0d5d851405e4249859a1c77378f0ee3;hp=a1763a683953289c3edf6b6d91126152d8eadba0;hpb=59842b15b028246d9d20fb9b8d276e16fffc908c;p=fs%2Flustre-release.git diff --git a/lustre/lfsck/lfsck_engine.c b/lustre/lfsck/lfsck_engine.c index a1763a6..f9c65b8 100644 --- a/lustre/lfsck/lfsck_engine.c +++ b/lustre/lfsck/lfsck_engine.c @@ -93,17 +93,6 @@ static void lfsck_di_dir_put(const struct lu_env *env, struct lfsck_instance *lf iops->put(env, di); } -static int lfsck_parent_fid(const struct lu_env *env, struct dt_object *obj, - struct lu_fid *fid) -{ - if (unlikely(!S_ISDIR(lfsck_object_type(obj)) || - !dt_try_as_dir(env, obj))) - return -ENOTDIR; - - return dt_lookup(env, obj, (struct dt_rec *)fid, - (const struct dt_key *)".."); -} - /** * Check whether needs to scan the directory or not. * @@ -217,7 +206,7 @@ static int lfsck_needs_scan_dir(const struct lu_env *env, if (rc < 0 && rc != -ENODATA) GOTO(out, rc); - rc = lfsck_parent_fid(env, obj, fid); + rc = dt_lookup_dir(env, obj, dotdot, fid); if (depth > 0) lfsck_object_put(env, obj); @@ -274,7 +263,7 @@ static int lfsck_load_stripe_lmv(const struct lu_env *env, else stripes = lmv->lmv_stripe_count; - OBD_ALLOC_LARGE(lslr, sizeof(*lslr) * stripes); + OBD_ALLOC_PTR_ARRAY_LARGE(lslr, stripes); if (lslr == NULL) { OBD_FREE_PTR(llmv); @@ -634,7 +623,6 @@ static int lfsck_double_scan(const struct lu_env *env, { struct lfsck_component *com; struct lfsck_component *next; - struct l_wait_info lwi = { 0 }; int rc = 0; int rc1 = 0; @@ -644,9 +632,8 @@ static int lfsck_double_scan(const struct lu_env *env, rc1 = rc; } - l_wait_event(lfsck->li_thread.t_ctl_waitq, - atomic_read(&lfsck->li_double_scan_count) == 0, - &lwi); + wait_event_idle(lfsck->li_thread.t_ctl_waitq, + atomic_read(&lfsck->li_double_scan_count) == 0); if (lfsck->li_status != LS_PAUSED && lfsck->li_status != LS_CO_PAUSED) { @@ -1026,7 +1013,6 @@ int lfsck_master_engine(void *args) struct dt_object *oit_obj = lfsck->li_obj_oit; const struct dt_it_ops *oit_iops = &oit_obj->do_index_ops->dio_it; struct dt_it *oit_di; - struct l_wait_info lwi = { 0 }; int rc; ENTRY; @@ -1074,7 +1060,7 @@ int lfsck_master_engine(void *args) lfsck->li_pos_checkpoint.lp_oit_cookie, lfsck->li_pos_checkpoint.lp_dir_cookie, PFID(&lfsck->li_pos_checkpoint.lp_dir_parent), - current_pid()); + current->pid); spin_lock(&lfsck->li_lock); if (unlikely(!thread_is_starting(thread))) { @@ -1086,10 +1072,9 @@ int lfsck_master_engine(void *args) spin_unlock(&lfsck->li_lock); wake_up_all(&thread->t_ctl_waitq); - l_wait_event(thread->t_ctl_waitq, - lfsck->li_start_unplug || - !thread_is_running(thread), - &lwi); + wait_event_idle(thread->t_ctl_waitq, + lfsck->li_start_unplug || + !thread_is_running(thread)); if (!thread_is_running(thread)) GOTO(fini_oit, rc = 0); @@ -1106,7 +1091,7 @@ int lfsck_master_engine(void *args) lfsck->li_pos_checkpoint.lp_oit_cookie, lfsck->li_pos_checkpoint.lp_dir_cookie, PFID(&lfsck->li_pos_checkpoint.lp_dir_parent), - current_pid(), rc); + current->pid, rc); if (!OBD_FAIL_CHECK(OBD_FAIL_LFSCK_CRASH)) rc = lfsck_post(env, lfsck, rc); @@ -1587,9 +1572,8 @@ int lfsck_assistant_engine(void *args) struct lfsck_assistant_data *lad = com->lc_data; struct ptlrpc_thread *mthread = &lfsck->li_thread; struct ptlrpc_thread *athread = &lad->lad_thread; - struct lfsck_assistant_operations *lao = lad->lad_ops; + const struct lfsck_assistant_operations *lao = lad->lad_ops; struct lfsck_assistant_req *lar; - struct l_wait_info lwi = { 0 }; int rc = 0; int rc1 = 0; int rc2; @@ -1650,12 +1634,11 @@ int lfsck_assistant_engine(void *args) GOTO(cleanup, rc); } - l_wait_event(athread->t_ctl_waitq, - !lfsck_assistant_req_empty(lad) || - 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); + wait_event_idle(athread->t_ctl_waitq, + !lfsck_assistant_req_empty(lad) || + test_bit(LAD_EXIT, &lad->lad_flags) || + test_bit(LAD_TO_POST, &lad->lad_flags) || + test_bit(LAD_TO_DOUBLE_SCAN, &lad->lad_flags)); if (unlikely(test_bit(LAD_EXIT, &lad->lad_flags))) GOTO(cleanup, rc = lad->lad_post_result); @@ -1715,6 +1698,8 @@ int lfsck_assistant_engine(void *args) GOTO(cleanup, rc = 0); while (test_bit(LAD_IN_DOUBLE_SCAN, &lad->lad_flags)) { + int seconds = 30; + rc = lfsck_assistant_query_others(env, com); if (lfsck_phase2_next_ready(lad)) goto p2_next; @@ -1724,26 +1709,24 @@ int lfsck_assistant_engine(void *args) /* Pull LFSCK status on related targets once * per 30 seconds if we are not notified. */ - lwi = LWI_TIMEOUT_INTERVAL(cfs_time_seconds(30), - cfs_time_seconds(1), - NULL, NULL); - rc = l_wait_event(athread->t_ctl_waitq, - lfsck_phase2_next_ready(lad) || - test_bit(LAD_EXIT, &lad->lad_flags) || - !thread_is_running(mthread), - &lwi); + while (seconds > 0 && + wait_event_idle_timeout( + athread->t_ctl_waitq, + lfsck_phase2_next_ready(lad) || + test_bit(LAD_EXIT, + &lad->lad_flags) || + !thread_is_running(mthread), + cfs_time_seconds(1)) == 0) + seconds -= 1; if (unlikely( test_bit(LAD_EXIT, &lad->lad_flags) || !thread_is_running(mthread))) GOTO(cleanup, rc = 0); - if (rc == -ETIMEDOUT) + if (seconds == 0) continue; - if (rc < 0) - GOTO(cleanup, rc); - p2_next: rc = lao->la_handler_p2(env, com); if (rc != 0)