LU-15886 lfsck: remove unreasonable assertions

[fs/lustre-release.git] / lustre / lfsck / lfsck_lib.c

diff --git a/lustre/lfsck/lfsck_lib.c b/lustre/lfsck/lfsck_lib.c
index 93ca2a2..7e36a18 100644 (file)
--- a/lustre/lfsck/lfsck_lib.c
+++ b/lustre/lfsck/lfsck_lib.c
@@ -158,7 +158,7 @@ static void lfsck_tgt_descs_fini(struct lfsck_tgt_descs *ltds)
        LASSERTF(ltds->ltd_tgtnr == 0, "tgt count unmatched: %d\n",
                 ltds->ltd_tgtnr);
 
-       for (idx = 0; idx < TGT_PTRS; idx++) {
+       for (idx = 0; idx < ARRAY_SIZE(ltds->ltd_tgts_idx); idx++) {
                if (ltds->ltd_tgts_idx[idx] != NULL) {
                        OBD_FREE_PTR(ltds->ltd_tgts_idx[idx]);
                        ltds->ltd_tgts_idx[idx] = NULL;
@@ -378,6 +378,7 @@ static int __lfsck_ibits_lock(const struct lu_env *env,
                einfo->ei_cb_bl = ldlm_blocking_ast;
                einfo->ei_cb_cp = ldlm_completion_ast;
                einfo->ei_res_id = resid;
+               einfo->ei_req_slot = 1;
 
                rc = dt_object_lock(env, obj, lh, einfo, policy);
                /* for regular checks LFSCK doesn't use LDLM locking,
@@ -621,7 +622,7 @@ static int lfsck_lpf_remove_name_entry(const struct lu_env *env,
        if (rc != 0)
                RETURN(rc);
 
-       th = dt_trans_create(env, dev);
+       th = lfsck_trans_create(env, dev, lfsck);
        if (IS_ERR(th))
                GOTO(unlock, rc = PTR_ERR(th));
 
@@ -687,7 +688,7 @@ static int lfsck_create_lpf_local(const struct lu_env *env,
        if (rc != 0)
                RETURN(rc);
 
-       th = dt_trans_create(env, dev);
+       th = lfsck_trans_create(env, dev, lfsck);
        if (IS_ERR(th))
                RETURN(PTR_ERR(th));
 
@@ -865,7 +866,7 @@ static int lfsck_create_lpf_remote(const struct lu_env *env,
        /* Transaction I: locally */
 
        dev = lfsck_obj2dev(child);
-       th = dt_trans_create(env, dev);
+       th = lfsck_trans_create(env, dev, lfsck);
        if (IS_ERR(th))
                RETURN(PTR_ERR(th));
 
@@ -962,7 +963,7 @@ static int lfsck_create_lpf_remote(const struct lu_env *env,
        /* Transaction II: remotely */
 
        dev = lfsck_obj2dev(parent);
-       th = dt_trans_create(env, dev);
+       th = lfsck_trans_create(env, dev, lfsck);
        if (IS_ERR(th))
                RETURN(PTR_ERR(th));
 
@@ -1280,7 +1281,7 @@ static int lfsck_verify_lpf_pairs(const struct lu_env *env,
                }
 
                cname = lfsck_name_get_const(env, name, strlen(name));
-               rc = lfsck_verify_linkea(env, child, cname, &LU_LPF_FID);
+               rc = lfsck_verify_linkea(env, lfsck, child, cname, &LU_LPF_FID);
                if (rc == 0)
                        rc = lfsck_update_lpf_entry(env, lfsck, parent, child,
                                                    name, type);
@@ -1498,11 +1499,8 @@ int lfsck_verify_lpf(const struct lu_env *env, struct lfsck_instance *lfsck)
                goto find_child1;
        }
 
-       if (unlikely(!dt_try_as_dir(env, child2))) {
-               lfsck_object_put(env, child2);
-               child2 = NULL;
-               rc = -ENOTDIR;
-       }
+       if (unlikely(!dt_try_as_dir(env, child2)))
+               GOTO(put, rc = -ENOTDIR);
 
 find_child1:
        if (fid_is_zero(&bk->lb_lpf_fid))
@@ -1515,7 +1513,8 @@ find_child1:
                }
 
                cname = lfsck_name_get_const(env, name, strlen(name));
-               rc = lfsck_verify_linkea(env, child2, cname, &LU_LPF_FID);
+               rc = lfsck_verify_linkea(env, lfsck, child2, cname,
+                                        &LU_LPF_FID);
 
                GOTO(put, rc);
        }
@@ -1665,9 +1664,6 @@ void lfsck_instance_cleanup(const struct lu_env *env,
                lfsck->li_obj_oit = NULL;
        }
 
-       LASSERT(lfsck->li_obj_dir == NULL);
-       LASSERT(lfsck->li_lmv == NULL);
-
        list_for_each_entry_safe(llu, llu_next, &lfsck->li_list_lmv, llu_link) {
                llmv = &llu->llu_lmv;
 
@@ -1846,6 +1842,7 @@ void lfsck_pos_fill(const struct lu_env *env, struct lfsck_instance *lfsck,
        if (unlikely(pos->lp_oit_cookie == 0))
                pos->lp_oit_cookie = 1;
 
+       spin_lock(&lfsck->li_lock);
        if (lfsck->li_di_dir != NULL) {
                struct dt_object *dto = lfsck->li_obj_dir;
 
@@ -1862,6 +1859,7 @@ void lfsck_pos_fill(const struct lu_env *env, struct lfsck_instance *lfsck,
                fid_zero(&pos->lp_dir_parent);
                pos->lp_dir_cookie = 0;
        }
+       spin_unlock(&lfsck->li_lock);
 }
 
 bool __lfsck_set_speed(struct lfsck_instance *lfsck, __u32 limit)
@@ -2592,7 +2590,7 @@ void lfsck_post_generic(const struct lu_env *env,
        CDEBUG(D_LFSCK, "%s: waiting for assistant to do %s post, rc = %d\n",
               lfsck_lfsck2name(com->lc_lfsck), lad->lad_name, *result);
 
-       wake_up_all(&athread->t_ctl_waitq);
+       wake_up(&athread->t_ctl_waitq);
        wait_event_idle(mthread->t_ctl_waitq,
                        (*result > 0 && list_empty(&lad->lad_req_list)) ||
                        thread_is_stopped(athread));
@@ -2620,7 +2618,7 @@ int lfsck_double_scan_generic(const struct lu_env *env,
               "status %d\n",
               lfsck_lfsck2name(com->lc_lfsck), lad->lad_name, status);
 
-       wake_up_all(&athread->t_ctl_waitq);
+       wake_up(&athread->t_ctl_waitq);
        wait_event_idle(mthread->t_ctl_waitq,
                        test_bit(LAD_IN_DOUBLE_SCAN, &lad->lad_flags) ||
                        thread_is_stopped(athread));
@@ -2643,7 +2641,7 @@ void lfsck_quit_generic(const struct lu_env *env,
        struct ptlrpc_thread            *athread = &lad->lad_thread;
 
        set_bit(LAD_EXIT, &lad->lad_flags);
-       wake_up_all(&athread->t_ctl_waitq);
+       wake_up(&athread->t_ctl_waitq);
        wait_event_idle(mthread->t_ctl_waitq,
                        thread_is_init(athread) ||
                        thread_is_stopped(athread));
@@ -3323,7 +3321,7 @@ trigger:
                        thread_is_stopped(thread));
        if (start == NULL || !(start->ls_flags & LPF_BROADCAST)) {
                lfsck->li_start_unplug = 1;
-               wake_up_all(&thread->t_ctl_waitq);
+               wake_up(&thread->t_ctl_waitq);
 
                GOTO(out, rc = 0);
        }
@@ -3342,13 +3340,13 @@ trigger:
                        spin_unlock(&lfsck->li_lock);
 
                        lfsck->li_start_unplug = 1;
-                       wake_up_all(&thread->t_ctl_waitq);
+                       wake_up(&thread->t_ctl_waitq);
                        wait_event_idle(thread->t_ctl_waitq,
                                        thread_is_stopped(thread));
                }
        } else {
                lfsck->li_start_unplug = 1;
-               wake_up_all(&thread->t_ctl_waitq);
+               wake_up(&thread->t_ctl_waitq);
        }
 
        GOTO(put, rc);
@@ -3430,7 +3428,7 @@ int lfsck_stop(const struct lu_env *env, struct dt_device *key,
                }
        }
 
-       wake_up_all(&thread->t_ctl_waitq);
+       wake_up(&thread->t_ctl_waitq);
        spin_unlock(&lfsck->li_lock);
        if (stop && stop->ls_flags & LPF_BROADCAST)
                rc1 = lfsck_stop_all(env, lfsck, stop);
@@ -3735,7 +3733,7 @@ int lfsck_register(const struct lu_env *env, struct dt_device *key,
 
                        cname = lfsck_name_get_const(env, dotlustre,
                                                     strlen(dotlustre));
-                       rc = lfsck_verify_linkea(env, obj, cname,
+                       rc = lfsck_verify_linkea(env, lfsck, obj, cname,
                                                 &lfsck->li_global_root_fid);
                        if (rc != 0)
                                GOTO(out, rc);
@@ -3755,7 +3753,7 @@ int lfsck_register(const struct lu_env *env, struct dt_device *key,
 
                        cname = lfsck_name_get_const(env, lostfound,
                                                     strlen(lostfound));
-                       rc = lfsck_verify_linkea(env, obj, cname, pfid);
+                       rc = lfsck_verify_linkea(env, lfsck, obj, cname, pfid);
                        if (rc != 0)
                                GOTO(out, rc);