X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flod%2Flod_lov.c;h=1a8f09a4a222d723046bd4bcafa639288f0aa7b1;hb=9ef9c1dc0deb46eb8cc7cafa51e7a81fec16d900;hp=5bd344ca8706f52748cda670df24c6f50554e32c;hpb=8e357d93ccc26e85e6ddf53360df72b47a254852;p=fs%2Flustre-release.git

diff --git a/lustre/lod/lod_lov.c b/lustre/lod/lod_lov.c
index 5bd344c..1a8f09a 100644
--- a/lustre/lod/lod_lov.c
+++ b/lustre/lod/lod_lov.c
@@ -590,6 +590,8 @@ int lod_generate_and_set_lovea(const struct lu_env *env,
 	info->lti_buf.lb_len = lmm_size;
 	rc = dt_xattr_set(env, next, &info->lti_buf, XATTR_NAME_LOV, 0,
 			  th, BYPASS_CAPA);
+	if (rc < 0)
+		lod_object_free_striping(env, lo);
 
 	RETURN(rc);
 }
@@ -737,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);
@@ -834,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 */
@@ -883,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;
@@ -920,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);
@@ -954,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);
@@ -994,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));