LU-1866 lfsck: LFSCK main engine

[fs/lustre-release.git] / lustre / lod / lod_object.c

diff --git a/lustre/lod/lod_object.c b/lustre/lod/lod_object.c
index de28d9c..fd36da5 100644 (file)
--- a/lustre/lod/lod_object.c
+++ b/lustre/lod/lod_object.c
@@ -124,8 +124,6 @@ static struct dt_it *lod_it_init(const struct lu_env *env,
 
 #define LOD_CHECK_IT(env, it)                                  \
 {                                                              \
-       /* IT is supposed to be in thread info always */        \
-       LASSERT((it) == &lod_env_info(env)->lti_it);            \
        LASSERT((it)->lit_obj != NULL);                         \
        LASSERT((it)->lit_it != NULL);                          \
 } while(0)
@@ -689,7 +687,7 @@ static void lod_ah_init(const struct lu_env *env,
         * in case of late striping creation, ->ah_init()
         * can be called with local object existing
         */
-       if (!dt_object_exists(nextc))
+       if (!dt_object_exists(nextc) || dt_object_remote(nextc))
                nextc->do_ops->do_ah_init(env, ah, nextp, nextc, child_mode);
 
        if (S_ISDIR(child_mode)) {
@@ -707,7 +705,10 @@ static void lod_ah_init(const struct lu_env *env,
                        lc->ldo_def_stripe_offset = lp->ldo_def_stripe_offset;
                        lc->ldo_striping_cached = 1;
                        lc->ldo_def_striping_set = 1;
-                       CDEBUG(D_OTHER, "inherite striping defaults\n");
+                       CDEBUG(D_OTHER, "inherite EA sz:%d off:%d nr:%d\n",
+                              (int)lc->ldo_def_stripenr,
+                              (int)lc->ldo_def_stripe_size,
+                              (int)lc->ldo_def_stripe_offset);
                }
                return;
        }
@@ -873,7 +874,6 @@ static int lod_declare_object_create(const struct lu_env *env,
        LASSERT(dof);
        LASSERT(attr);
        LASSERT(th);
-       LASSERT(!dt_object_exists(next));
 
        /*
         * first of all, we declare creation of local object
@@ -901,11 +901,35 @@ static int lod_declare_object_create(const struct lu_env *env,
        } else if (dof->dof_type == DFT_DIR && lo->ldo_striping_cached) {
                struct lod_thread_info *info = lod_env_info(env);
 
-               info->lti_buf.lb_buf = NULL;
-               info->lti_buf.lb_len = sizeof(struct lov_user_md_v3);
+               struct lov_user_md_v3 *v3;
+
+               if (LOVEA_DELETE_VALUES(lo->ldo_def_stripe_size,
+                                       lo->ldo_def_stripenr,
+                                       lo->ldo_def_stripe_offset))
+                       RETURN(0);
+
+               OBD_ALLOC_PTR(v3);
+               if (v3 == NULL)
+                       RETURN(-ENOMEM);
+
+               v3->lmm_magic = cpu_to_le32(LOV_MAGIC_V3);
+               v3->lmm_pattern = cpu_to_le32(LOV_PATTERN_RAID0);
+               v3->lmm_object_id = fid_oid(lu_object_fid(&dt->do_lu));
+               v3->lmm_object_seq = fid_seq(lu_object_fid(&dt->do_lu));
+               v3->lmm_stripe_size = cpu_to_le32(lo->ldo_def_stripe_size);
+               v3->lmm_stripe_count = cpu_to_le32(lo->ldo_def_stripenr);
+               v3->lmm_stripe_offset = cpu_to_le16(lo->ldo_def_stripe_offset);
+               if (lo->ldo_pool)
+                       strncpy(v3->lmm_pool_name, lo->ldo_pool,
+                               LOV_MAXPOOLNAME);
+
+               info->lti_buf.lb_buf = v3;
+               info->lti_buf.lb_len = sizeof(*v3);
+
                /* to transfer default striping from the parent */
                rc = dt_declare_xattr_set(env, next, &info->lti_buf,
                                          XATTR_NAME_LOV, 0, th);
+               OBD_FREE_PTR(v3);
        }
 
 out:
@@ -1104,6 +1128,26 @@ struct dt_object_operations lod_obj_ops = {
        .do_object_sync         = lod_object_sync,
 };
 
+static int lod_object_lock(const struct lu_env *env,
+                          struct dt_object *dt, struct lustre_handle *lh,
+                          struct ldlm_enqueue_info *einfo,
+                          void *policy)
+{
+       struct dt_object   *next = dt_object_child(dt);
+       int              rc;
+       ENTRY;
+
+       /*
+        * declare setattr on the local object
+        */
+       rc = dt_object_lock(env, next, lh, einfo, policy);
+
+       RETURN(rc);
+}
+
+struct dt_lock_operations lod_lock_ops = {
+       .do_object_lock       = lod_object_lock,
+};
 static ssize_t lod_read(const struct lu_env *env, struct dt_object *dt,
                        struct lu_buf *buf, loff_t *pos,
                        struct lustre_capa *capa)