LU-15886 lfsck: remove unreasonable assertions

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

diff --git a/lustre/lfsck/lfsck_namespace.c b/lustre/lfsck/lfsck_namespace.c
index 9569d0c..df57d18 100644 (file)
--- a/lustre/lfsck/lfsck_namespace.c
+++ b/lustre/lfsck/lfsck_namespace.c
@@ -531,7 +531,7 @@ int lfsck_namespace_trace_update(const struct lu_env *env,
                GOTO(log, rc);
        }
 
-       th = dt_trans_create(env, dev);
+       th = lfsck_trans_create(env, dev, lfsck);
        if (IS_ERR(th))
                GOTO(log, rc = PTR_ERR(th));
 
@@ -695,7 +695,7 @@ static int lfsck_namespace_links_remove(const struct lu_env *env,
 
        LASSERT(dt_object_remote(obj) == 0);
 
-       th = dt_trans_create(env, dev);
+       th = lfsck_trans_create(env, dev, lfsck);
        if (IS_ERR(th))
                GOTO(log, rc = PTR_ERR(th));
 
@@ -830,7 +830,7 @@ static void lfsck_linkea_del_buf(struct linkea_data *ldata,
 
                ldata->ld_lee = NULL;
        } else {
-               linkea_del_buf(ldata, lname);
+               linkea_del_buf(ldata, lname, false);
        }
 }
 
@@ -990,7 +990,7 @@ again:
 
        lfsck_buf_init(&linkea_buf, ldata2.ld_buf->lb_buf,
                       ldata2.ld_leh->leh_len);
-       th = dt_trans_create(env, dev);
+       th = lfsck_trans_create(env, dev, lfsck);
        if (IS_ERR(th))
                GOTO(log, rc = PTR_ERR(th));
 
@@ -1122,7 +1122,7 @@ static int lfsck_lmv_set(const struct lu_env *env,
 
        ENTRY;
 
-       th = dt_trans_create(env, dev);
+       th = lfsck_trans_create(env, dev, lfsck);
        if (IS_ERR(th))
                RETURN(PTR_ERR(th));
 
@@ -1155,7 +1155,7 @@ static int lfsck_lmv_delete(const struct lu_env *env,
 
        ENTRY;
 
-       th = dt_trans_create(env, dev);
+       th = lfsck_trans_create(env, dev, lfsck);
        if (IS_ERR(th))
                RETURN(PTR_ERR(th));
 
@@ -1320,7 +1320,7 @@ static int lfsck_namespace_insert_normal(const struct lu_env *env,
        if (unlikely(!dt_try_as_dir(env, parent)))
                GOTO(unlock, rc = -ENOTDIR);
 
-       th = dt_trans_create(env, dev);
+       th = lfsck_trans_create(env, dev, lfsck);
        if (IS_ERR(th))
                GOTO(unlock, rc = PTR_ERR(th));
 
@@ -1464,7 +1464,8 @@ static int lfsck_namespace_create_orphan_dir(const struct lu_env *env,
                GOTO(log, rc = 1);
 
        if (dt_object_remote(orphan)) {
-               LASSERT(lfsck->li_lpf_root_obj != NULL);
+               if (lfsck->li_lpf_root_obj == NULL)
+                       GOTO(log, rc = -EBADF);
 
                idx = lfsck_find_mdt_idx_by_fid(env, lfsck, cfid);
                if (idx < 0)
@@ -1538,7 +1539,7 @@ again:
        if (rc != 0)
                GOTO(unlock1, rc);
 
-       th = dt_trans_create(env, dev);
+       th = lfsck_trans_create(env, dev, lfsck);
        if (IS_ERR(th))
                GOTO(unlock1, rc = PTR_ERR(th));
 
@@ -1730,7 +1731,7 @@ static int lfsck_namespace_shrink_linkea(const struct lu_env *env,
        }
 
 again:
-       th = dt_trans_create(env, dev);
+       th = lfsck_trans_create(env, dev, lfsck);
        if (IS_ERR(th))
                GOTO(unlock1, rc = PTR_ERR(th));
 
@@ -2045,7 +2046,7 @@ replace:
        if (lfsck->li_bookmark_ram.lb_param & LPF_DRYRUN)
                GOTO(log, rc = 1);
 
-       th = dt_trans_create(env, dev);
+       th = lfsck_trans_create(env, dev, lfsck);
        if (IS_ERR(th))
                GOTO(log, rc = PTR_ERR(th));
 
@@ -2131,7 +2132,7 @@ int lfsck_namespace_rebuild_linkea(const struct lu_env *env,
        int                              rc     = 0;
        ENTRY;
 
-       th = dt_trans_create(env, dev);
+       th = lfsck_trans_create(env, dev, lfsck);
        if (IS_ERR(th))
                GOTO(log, rc = PTR_ERR(th));
 
@@ -2237,7 +2238,7 @@ int lfsck_namespace_repair_dirent(const struct lu_env *env,
        if (rc != 0)
                GOTO(log, rc);
 
-       th = dt_trans_create(env, dev);
+       th = lfsck_trans_create(env, dev, lfsck);
        if (IS_ERR(th))
                GOTO(unlock1, rc = PTR_ERR(th));
 
@@ -2384,7 +2385,7 @@ static int lfsck_namespace_repair_unmatched_pairs(const struct lu_env *env,
        lfsck_buf_init(&linkea_buf, ldata.ld_buf->lb_buf,
                       ldata.ld_leh->leh_len);
 
-       th = dt_trans_create(env, dev);
+       th = lfsck_trans_create(env, dev, lfsck);
        if (IS_ERR(th))
                GOTO(log, rc = PTR_ERR(th));
 
@@ -3107,7 +3108,7 @@ static int lfsck_namespace_repair_nlink(const struct lu_env *env,
        if (rc != 0)
                GOTO(log, rc);
 
-       th = dt_trans_create(env, dev);
+       th = lfsck_trans_create(env, dev, lfsck);
        if (IS_ERR(th))
                GOTO(log, rc = PTR_ERR(th));
 
@@ -3467,7 +3468,7 @@ static int lfsck_namespace_linkea_clear_overflow(const struct lu_env *env,
        if (rc != 0)
                GOTO(log, rc);
 
-       th = dt_trans_create(env, dev);
+       th = lfsck_trans_create(env, dev, lfsck);
        if (IS_ERR(th))
                GOTO(log, rc = PTR_ERR(th));
 
@@ -3493,10 +3494,6 @@ static int lfsck_namespace_linkea_clear_overflow(const struct lu_env *env,
        if (lfsck->li_bookmark_ram.lb_param & LPF_DRYRUN)
                GOTO(unlock, rc = 1);
 
-       /* If all known entries are in the linkEA, then the 'leh_reccount'
-        * should NOT be zero. */
-       LASSERT(ldata->ld_leh->leh_reccount > 0);
-
        lfsck_buf_init(&linkea_buf, ldata->ld_buf->lb_buf,
                       ldata->ld_leh->leh_len);
        rc = dt_xattr_set(env, obj, &linkea_buf, XATTR_NAME_LINK, 0, th);
@@ -3606,7 +3603,7 @@ static int lfsck_namespace_check_agent_entry(const struct lu_env *env,
                if (rc)
                        GOTO(out, rc);
 
-               handle = dt_trans_create(env, dev);
+               handle = lfsck_trans_create(env, dev, lfsck);
                if (IS_ERR(handle))
                        GOTO(unlock, rc = PTR_ERR(handle));
 
@@ -3778,7 +3775,7 @@ static int lfsck_namespace_double_scan_one(const struct lu_env *env,
 
                        repaired = true;
 
-                       /* fall through */
+                       /* fallthrough */
                }
 
                parent = lfsck_object_find_bottom(env, lfsck, pfid);
@@ -4366,7 +4363,7 @@ static void lfsck_namespace_close_dir(const struct lu_env *env,
        lad->lad_prefetched++;
        spin_unlock(&lad->lad_lock);
        if (wakeup)
-               wake_up_all(&lad->lad_thread.t_ctl_waitq);
+               wake_up(&lad->lad_thread.t_ctl_waitq);
 
        EXIT;
 }
@@ -4711,7 +4708,7 @@ static int lfsck_namespace_exec_dir(const struct lu_env *env,
        lad->lad_prefetched++;
        spin_unlock(&lad->lad_lock);
        if (wakeup)
-               wake_up_all(&lad->lad_thread.t_ctl_waitq);
+               wake_up(&lad->lad_thread.t_ctl_waitq);
 
        down_write(&com->lc_sem);
        com->lc_new_checked++;
@@ -5153,7 +5150,7 @@ static int lfsck_namespace_in_notify(const struct lu_env *env,
                stop->ls_flags = lr->lr_param & ~LPF_BROADCAST;
                lfsck_stop(env, lfsck->li_bottom, stop);
        } else if (lfsck_phase2_next_ready(lad)) {
-               wake_up_all(&lad->lad_thread.t_ctl_waitq);
+               wake_up(&lad->lad_thread.t_ctl_waitq);
        }
 
        RETURN(0);
@@ -5388,7 +5385,7 @@ int lfsck_namespace_repair_dangling(const struct lu_env *env,
         * the MDT-object without stripes (dof->dof_reg.striped = 0). related
         * OST-objects will be created when write open. */
 
-       th = dt_trans_create(env, dev);
+       th = lfsck_trans_create(env, dev, lfsck);
        if (IS_ERR(th))
                GOTO(unlock_child, rc = PTR_ERR(th));
 
@@ -5730,7 +5727,7 @@ again:
                if (rc != 0)
                        GOTO(out, rc);
 
-               handle = dt_trans_create(env, dev);
+               handle = lfsck_trans_create(env, dev, lfsck);
                if (IS_ERR(handle))
                        GOTO(out, rc = PTR_ERR(handle));
 
@@ -5828,6 +5825,17 @@ again:
                newdata = true;
 
 nodata:
+               if (rc == -ENOENT &&
+                   linkea_will_overflow(&ldata, cname)) {
+                       CDEBUG(D_INODE, "No enough space to hold linkea entry '"
+                              DFID": %.*s' at %u\n", PFID(pfid),
+                              cname->ln_namelen, cname->ln_name,
+                              ldata.ld_leh->leh_overflow_time);
+                       log = true;
+                       rc = 0;
+                       goto stop;
+               }
+
                if (bk->lb_param & LPF_DRYRUN) {
                        if (rc == -ENODATA)
                                ns->ln_flags |= LF_UPGRADE;
@@ -5883,7 +5891,7 @@ nodata:
                                GOTO(stop, rc);
                }
 
-               rc = linkea_add_buf(&ldata, cname, pfid);
+               rc = linkea_add_buf(&ldata, cname, pfid, false);
                if (rc == 0)
                        rc = lfsck_links_write(env, obj, &ldata, handle);
                if (rc != 0)
@@ -6118,13 +6126,19 @@ static int lfsck_namespace_scan_local_lpf_one(const struct lu_env *env,
        int                              rc     = 0;
        __u8                             flags  = 0;
        bool                             exist  = false;
+
        ENTRY;
 
        child = lfsck_object_find_by_dev(env, dev, &ent->lde_fid);
        if (IS_ERR(child))
                RETURN(PTR_ERR(child));
 
-       LASSERT(dt_object_exists(child));
+       if (!dt_object_exists(child)) {
+               CDEBUG(D_LFSCK, "%s: lost+found/%s doesn't exist\n",
+                      lfsck_lfsck2name(lfsck), ent->lde_name);
+               GOTO(out, rc = -ENOENT);
+       }
+
        LASSERT(!dt_object_remote(child));
 
        idx = lfsck_sub_trace_file_fid2idx(&ent->lde_fid);
@@ -6141,7 +6155,7 @@ static int lfsck_namespace_scan_local_lpf_one(const struct lu_env *env,
                GOTO(out, rc);
        }
 
-       th = dt_trans_create(env, dev);
+       th = lfsck_trans_create(env, dev, lfsck);
        if (IS_ERR(th))
                GOTO(out, rc = PTR_ERR(th));
 
@@ -6870,8 +6884,9 @@ const struct lfsck_assistant_operations lfsck_namespace_assistant_ops = {
  * \retval             0 for success
  * \retval             negative error number on failure
  */
-int lfsck_verify_linkea(const struct lu_env *env, struct dt_object *obj,
-                       const struct lu_name *cname, const struct lu_fid *pfid)
+int lfsck_verify_linkea(const struct lu_env *env, struct lfsck_instance *lfsck,
+                       struct dt_object *obj, const struct lu_name *cname,
+                       const struct lu_fid *pfid)
 {
        struct dt_device        *dev    = lfsck_obj2dev(obj);
        struct linkea_data       ldata  = { NULL };
@@ -6880,9 +6895,14 @@ int lfsck_verify_linkea(const struct lu_env *env, struct dt_object *obj,
        int                      rc;
        int                      fl     = LU_XATTR_CREATE;
        bool                     dirty  = false;
+
        ENTRY;
 
-       LASSERT(S_ISDIR(lfsck_object_type(obj)));
+       if (!dt_object_exists(obj))
+               RETURN(-ENOENT);
+
+       if (!S_ISDIR(lfsck_object_type(obj)))
+               RETURN(-ENOTDIR);
 
        rc = lfsck_links_read_with_rec(env, obj, &ldata);
        if (rc == -ENODATA) {
@@ -6908,7 +6928,7 @@ int lfsck_verify_linkea(const struct lu_env *env, struct dt_object *obj,
 
        lfsck_buf_init(&linkea_buf, ldata.ld_buf->lb_buf,
                       ldata.ld_leh->leh_len);
-       th = dt_trans_create(env, dev);
+       th = lfsck_trans_create(env, dev, lfsck);
        if (IS_ERR(th))
                RETURN(PTR_ERR(th));
 
@@ -7002,7 +7022,7 @@ int lfsck_update_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));
 
@@ -7140,14 +7160,14 @@ int lfsck_namespace_setup(const struct lu_env *env,
        default:
                CERROR("%s: unknown lfsck_namespace status %d\n",
                       lfsck_lfsck2name(lfsck), ns->ln_status);
-               /* fall through */
+               fallthrough;
        case LS_SCANNING_PHASE1:
        case LS_SCANNING_PHASE2:
                /* No need to store the status to disk right now.
                 * If the system crashed before the status stored,
                 * it will be loaded back when next time. */
                ns->ln_status = LS_CRASHED;
-               /* fall through */
+               fallthrough;
        case LS_PAUSED:
        case LS_CRASHED:
                spin_lock(&lfsck->li_lock);