LU-7243 misc: update Intel copyright messages 2015

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

diff --git a/lustre/lfsck/lfsck_engine.c b/lustre/lfsck/lfsck_engine.c
index 375e64c..6daaf80 100644 (file)
--- a/lustre/lfsck/lfsck_engine.c
+++ b/lustre/lfsck/lfsck_engine.c
@@ -20,7 +20,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2013, 2014, Intel Corporation.
+ * Copyright (c) 2013, 2015, Intel Corporation.
  */
 /*
  * lustre/lfsck/lfsck_engine.c
@@ -93,64 +93,6 @@ static void lfsck_di_dir_put(const struct lu_env *env, struct lfsck_instance *lf
        iops->put(env, di);
 }
 
-static int lfsck_update_lma(const struct lu_env *env,
-                           struct lfsck_instance *lfsck, struct dt_object *obj)
-{
-       struct lfsck_thread_info        *info   = lfsck_env_info(env);
-       struct lfsck_bookmark           *bk     = &lfsck->li_bookmark_ram;
-       struct dt_device                *dev    = lfsck_obj2dev(obj);
-       struct lustre_mdt_attrs         *lma    = &info->lti_lma;
-       struct lu_buf                   *buf;
-       struct thandle                  *th;
-       int                              fl;
-       int                              rc;
-       ENTRY;
-
-       if (bk->lb_param & LPF_DRYRUN)
-               RETURN(0);
-
-       buf = lfsck_buf_get(env, info->lti_lma_old, LMA_OLD_SIZE);
-       rc = dt_xattr_get(env, obj, buf, XATTR_NAME_LMA);
-       if (rc < 0) {
-               if (rc != -ENODATA)
-                       RETURN(rc);
-
-               fl = LU_XATTR_CREATE;
-               lustre_lma_init(lma, lfsck_dto2fid(obj), LMAC_FID_ON_OST, 0);
-       } else {
-               if (rc != LMA_OLD_SIZE && rc != sizeof(struct lustre_mdt_attrs))
-                       RETURN(-EINVAL);
-
-               fl = LU_XATTR_REPLACE;
-               lustre_lma_swab(lma);
-               lustre_lma_init(lma, lfsck_dto2fid(obj),
-                               lma->lma_compat | LMAC_FID_ON_OST,
-                               lma->lma_incompat);
-       }
-       lustre_lma_swab(lma);
-
-       th = dt_trans_create(env, dev);
-       if (IS_ERR(th))
-               RETURN(PTR_ERR(th));
-
-       buf = lfsck_buf_get(env, lma, sizeof(*lma));
-       rc = dt_declare_xattr_set(env, obj, buf, XATTR_NAME_LMA, fl, th);
-       if (rc != 0)
-               GOTO(stop, rc);
-
-       rc = dt_trans_start_local(env, dev, th);
-       if (rc != 0)
-               GOTO(stop, rc);
-
-       rc = dt_xattr_set(env, obj, buf, XATTR_NAME_LMA, fl, th);
-
-       GOTO(stop, rc);
-
-stop:
-       dt_trans_stop(env, dev, th);
-       return rc;
-}
-
 static int lfsck_parent_fid(const struct lu_env *env, struct dt_object *obj,
                            struct lu_fid *fid)
 {
@@ -780,8 +722,7 @@ static int lfsck_master_dir_engine(const struct lu_env *env,
                                goto checkpoint;
                }
 
-               if (ent->lde_attrs & LUDA_IGNORE &&
-                   strcmp(ent->lde_name, dotdot) != 0)
+               if (ent->lde_attrs & LUDA_IGNORE)
                        goto checkpoint;
 
                /* skip dot entry. */
@@ -887,7 +828,6 @@ static int lfsck_master_oit_engine(const struct lu_env *env,
 
        do {
                struct dt_object *target;
-               bool              update_lma = false;
 
                if (lfsck->li_di_dir != NULL) {
                        rc = lfsck_master_dir_engine(env, lfsck);
@@ -956,13 +896,23 @@ static int lfsck_master_oit_engine(const struct lu_env *env,
 
                        LASSERT(!lfsck->li_master);
 
-                       /* It is an old format device, update the LMA. */
                        if (idx != idx1) {
                                struct ost_id *oi = &info->lti_oi;
 
+                               if (unlikely(idx1 != 0)) {
+                                       CDEBUG(D_LFSCK, "%s: invalid IDIF "DFID
+                                              ", not match device index %u\n",
+                                              lfsck_lfsck2name(lfsck),
+                                              PFID(fid), idx);
+
+                                       goto checkpoint;
+                               }
+
+                               /* rebuild the IDIF with index to
+                                * avoid double instances for the
+                                * same object. */
                                fid_to_ostid(fid, oi);
                                ostid_to_fid(fid, oi, idx);
-                               update_lma = true;
                        }
                } else if (!fid_is_norm(fid) && !fid_is_igif(fid) &&
                           !fid_is_last_id(fid) &&
@@ -1004,18 +954,9 @@ static int lfsck_master_oit_engine(const struct lu_env *env,
                                goto checkpoint;
                }
 
-               if (dt_object_exists(target)) {
-                       if (update_lma) {
-                               rc = lfsck_update_lma(env, lfsck, target);
-                               if (rc != 0)
-                                       CDEBUG(D_LFSCK, "%s: fail to update "
-                                              "LMA for "DFID": rc = %d\n",
-                                              lfsck_lfsck2name(lfsck),
-                                              PFID(lfsck_dto2fid(target)), rc);
-                       }
-                       if (rc == 0)
-                               rc = lfsck_exec_oit(env, lfsck, target);
-               }
+               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)
                        RETURN(rc);
@@ -1381,7 +1322,7 @@ next:
                spin_lock(&ltds->ltd_lock);
                if (com->lc_type == LFSCK_TYPE_LAYOUT) {
                        cfs_foreach_bit(ltds->ltd_tgts_bitmap, idx) {
-                               ltd = LTD_TGT(ltds, idx);
+                               ltd = lfsck_ltd2tgt(ltds, idx);
                                LASSERT(ltd != NULL);
 
                                if (!list_empty(&ltd->ltd_layout_list))
@@ -1394,7 +1335,7 @@ next:
                        }
                } else {
                        cfs_foreach_bit(ltds->ltd_tgts_bitmap, idx) {
-                               ltd = LTD_TGT(ltds, idx);
+                               ltd = lfsck_ltd2tgt(ltds, idx);
                                LASSERT(ltd != NULL);
 
                                if (!list_empty(&ltd->ltd_namespace_list))