LU-5100 llite: set dir LOV xattr length variable

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

diff --git a/lustre/lod/lod_lov.c b/lustre/lod/lod_lov.c
index 937e7ab..1a8f09a 100644 (file)
--- a/lustre/lod/lod_lov.c
+++ b/lustre/lod/lod_lov.c
@@ -739,6 +739,9 @@ int lod_initialize_objects(const struct lu_env *env, struct lod_object *lo,
                RETURN(-ENOMEM);
 
        for (i = 0; i < lo->ldo_stripenr; i++) {
+               if (unlikely(lovea_slot_is_dummy(&objs[i])))
+                       continue;
+
                ostid_le_to_cpu(&objs[i].l_ost_oi, &info->lti_ostid);
                idx = le32_to_cpu(objs[i].l_ost_idx);
                rc = ostid_to_fid(&info->lti_fid, &info->lti_ostid, idx);
@@ -836,28 +839,22 @@ out:
        RETURN(rc);
 }
 
-/*
- * Load and parse striping information, create in-core representation for the
- * stripes
- */
-int lod_load_striping(const struct lu_env *env, struct lod_object *lo)
+int lod_load_striping_locked(const struct lu_env *env, struct lod_object *lo)
 {
        struct lod_thread_info  *info = lod_env_info(env);
        struct dt_object        *next = dt_object_child(&lo->ldo_obj);
        int                      rc = 0;
        ENTRY;
 
-       /*
-        * currently this code is supposed to be called from declaration
-        * phase only, thus the object is not expected to be locked by caller
-        */
-       dt_write_lock(env, next, 0);
        /* already initialized? */
        if (lo->ldo_stripe != NULL)
                GOTO(out, rc = 0);
 
+       if (!dt_object_exists(next))
+               GOTO(out, rc = 0);
+
        /* Do not load stripe for slaves of striped dir */
-       if (!dt_object_exists(next) || lo->ldo_dir_slave_stripe)
+       if (lo->ldo_dir_slave_stripe)
                GOTO(out, rc = 0);
 
        /* only regular files can be striped */
@@ -885,12 +882,29 @@ int lod_load_striping(const struct lu_env *env, struct lod_object *lo)
                rc = lod_parse_dir_striping(env, lo, &info->lti_buf);
        }
 out:
-       dt_write_unlock(env, next);
        RETURN(rc);
 }
 
+/**
+ * Load and parse striping information, create in-core representation for the
+ * stripes
+ **/
+int lod_load_striping(const struct lu_env *env, struct lod_object *lo)
+{
+       struct dt_object        *next = dt_object_child(&lo->ldo_obj);
+       int                     rc = 0;
+
+       /* currently this code is supposed to be called from declaration
+        * phase only, thus the object is not expected to be locked by caller */
+       dt_write_lock(env, next, 0);
+       rc = lod_load_striping_locked(env, lo);
+       dt_write_unlock(env, next);
+       return rc;
+}
+
+/* verify the striping information for directory */
 int lod_verify_striping(struct lod_device *d, const struct lu_buf *buf,
-                       int specific)
+                       bool is_from_disk)
 {
        struct lov_user_md_v1   *lum;
        struct lov_user_md_v3   *lum3;
@@ -922,8 +936,11 @@ int lod_verify_striping(struct lod_device *d, const struct lu_buf *buf,
                GOTO(out, rc = -EINVAL);
        }
 
-       if ((specific && le32_to_cpu(lum->lmm_pattern) != LOV_PATTERN_RAID0) ||
-           (!specific && lum->lmm_pattern != 0)) {
+       /* the user uses "0" for default stripe pattern normally. */
+       if (!is_from_disk && lum->lmm_pattern == 0)
+               lum->lmm_pattern = cpu_to_le32(LOV_PATTERN_RAID0);
+
+       if (le32_to_cpu(lum->lmm_pattern) != LOV_PATTERN_RAID0) {
                CDEBUG(D_IOCTL, "bad userland stripe pattern: %#x\n",
                       le32_to_cpu(lum->lmm_pattern));
                GOTO(out, rc = -EINVAL);
@@ -956,17 +973,17 @@ int lod_verify_striping(struct lod_device *d, const struct lu_buf *buf,
                }
        }
 
-       stripe_count = le16_to_cpu(lum->lmm_stripe_count);
        if (magic == LOV_USER_MAGIC_V1 || magic == LOV_MAGIC_V1_DEF)
                lum_size = offsetof(struct lov_user_md_v1,
-                                   lmm_objects[stripe_count]);
+                                   lmm_objects[0]);
        else if (magic == LOV_USER_MAGIC_V3 || magic == LOV_MAGIC_V3_DEF)
                lum_size = offsetof(struct lov_user_md_v3,
-                                   lmm_objects[stripe_count]);
+                                   lmm_objects[0]);
        else
-               LBUG();
+               GOTO(out, rc = -EINVAL);
 
-       if (specific && buf->lb_len != lum_size) {
+       stripe_count = le16_to_cpu(lum->lmm_stripe_count);
+       if (buf->lb_len != lum_size) {
                CDEBUG(D_IOCTL, "invalid buf len %zd for lov_user_md with "
                       "magic %#x and stripe_count %u\n",
                       buf->lb_len, magic, stripe_count);
@@ -996,7 +1013,7 @@ int lod_verify_striping(struct lod_device *d, const struct lu_buf *buf,
                        GOTO(out, rc = -EINVAL);
        }
 
-       if (specific && stripe_count > pool_tgt_count(pool)) {
+       if (is_from_disk && stripe_count > pool_tgt_count(pool)) {
                CDEBUG(D_IOCTL,
                       "stripe count %u > # OSTs %u in the pool\n",
                       stripe_count, pool_tgt_count(pool));