X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flov%2Flov_ea.c;h=6ab28e982eddcea7967f3960b150cbdf74d39617;hb=9c6ebfd11be1cc11629a2960c8c818492e1f0980;hp=51a9118d8ca232307b076a55f43753c6db9572f2;hpb=cc5ef6ae5412c3e94061d949ef684036eb003f27;p=fs%2Flustre-release.git

diff --git a/lustre/lov/lov_ea.c b/lustre/lov/lov_ea.c
index 51a9118..6ab28e9 100644
--- a/lustre/lov/lov_ea.c
+++ b/lustre/lov/lov_ea.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Intel Corporation.
+ * Copyright (c) 2011, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -61,33 +61,32 @@ struct lovea_unpack_args {
 static int lsm_lmm_verify_common(struct lov_mds_md *lmm, int lmm_bytes,
                                  __u16 stripe_count)
 {
+	if (stripe_count > LOV_V1_INSANE_STRIPE_COUNT) {
+		CERROR("bad stripe count %d\n", stripe_count);
+		lov_dump_lmm_common(D_WARNING, lmm);
+		return -EINVAL;
+	}
 
-        if (stripe_count == 0 || stripe_count > LOV_V1_INSANE_STRIPE_COUNT) {
-                CERROR("bad stripe count %d\n", stripe_count);
-                lov_dump_lmm(D_WARNING, lmm);
-                return -EINVAL;
-        }
-
-        if (lmm->lmm_object_id == 0) {
-                CERROR("zero object id\n");
-                lov_dump_lmm(D_WARNING, lmm);
-                return -EINVAL;
-        }
+	if (lmm_oi_id(&lmm->lmm_oi) == 0) {
+		CERROR("zero object id\n");
+		lov_dump_lmm_common(D_WARNING, lmm);
+		return -EINVAL;
+	}
 
-        if (lmm->lmm_pattern != cpu_to_le32(LOV_PATTERN_RAID0)) {
-                CERROR("bad striping pattern\n");
-                lov_dump_lmm(D_WARNING, lmm);
-                return -EINVAL;
-        }
+	if (lov_pattern(le32_to_cpu(lmm->lmm_pattern)) != LOV_PATTERN_RAID0) {
+		CERROR("bad striping pattern\n");
+		lov_dump_lmm_common(D_WARNING, lmm);
+		return -EINVAL;
+	}
 
-        if (lmm->lmm_stripe_size == 0 ||
-             (le32_to_cpu(lmm->lmm_stripe_size)&(LOV_MIN_STRIPE_SIZE-1)) != 0) {
-                CERROR("bad stripe size %u\n",
-                       le32_to_cpu(lmm->lmm_stripe_size));
-                lov_dump_lmm(D_WARNING, lmm);
-                return -EINVAL;
-        }
-        return 0;
+	if (lmm->lmm_stripe_size == 0 ||
+	    (le32_to_cpu(lmm->lmm_stripe_size)&(LOV_MIN_STRIPE_SIZE-1)) != 0) {
+		CERROR("bad stripe size %u\n",
+		       le32_to_cpu(lmm->lmm_stripe_size));
+		lov_dump_lmm_common(D_WARNING, lmm);
+		return -EINVAL;
+	}
+	return 0;
 }
 
 struct lov_stripe_md *lsm_alloc_plain(__u16 stripe_count, int *size)
@@ -106,7 +105,7 @@ struct lov_stripe_md *lsm_alloc_plain(__u16 stripe_count, int *size)
                 return NULL;;
 
         for (i = 0; i < stripe_count; i++) {
-                OBD_SLAB_ALLOC_PTR_GFP(loi, lov_oinfo_slab, CFS_ALLOC_IO);
+		OBD_SLAB_ALLOC_PTR_GFP(loi, lov_oinfo_slab, __GFP_IO);
                 if (loi == NULL)
                         goto err;
                 lsm->lsm_oinfo[i] = loi;
@@ -136,16 +135,15 @@ void lsm_free_plain(struct lov_stripe_md *lsm)
 static void lsm_unpackmd_common(struct lov_stripe_md *lsm,
                                 struct lov_mds_md *lmm)
 {
-        /*
-         * This supposes lov_mds_md_v1/v3 first fields are
-         * are the same
-         */
-        lsm->lsm_object_id = le64_to_cpu(lmm->lmm_object_id);
-        lsm->lsm_object_seq = le64_to_cpu(lmm->lmm_object_seq);
-        lsm->lsm_stripe_size = le32_to_cpu(lmm->lmm_stripe_size);
-        lsm->lsm_pattern = le32_to_cpu(lmm->lmm_pattern);
-        lsm->lsm_layout_gen = le16_to_cpu(lmm->lmm_layout_gen);
-        lsm->lsm_pool_name[0] = '\0';
+	/*
+	 * This supposes lov_mds_md_v1/v3 first fields are
+	 * are the same
+	 */
+	lmm_oi_le_to_cpu(&lsm->lsm_oi, &lmm->lmm_oi);
+	lsm->lsm_stripe_size = le32_to_cpu(lmm->lmm_stripe_size);
+	lsm->lsm_pattern = le32_to_cpu(lmm->lmm_pattern);
+	lsm->lsm_layout_gen = le16_to_cpu(lmm->lmm_layout_gen);
+	lsm->lsm_pool_name[0] = '\0';
 }
 
 static void
@@ -196,22 +194,24 @@ static void lov_tgt_maxbytes(struct lov_tgt_desc *tgt, __u64 *stripe_maxbytes)
 static int lsm_lmm_verify_v1(struct lov_mds_md_v1 *lmm, int lmm_bytes,
                              __u16 *stripe_count)
 {
-        if (lmm_bytes < sizeof(*lmm)) {
-                CERROR("lov_mds_md_v1 too small: %d, need at least %d\n",
-                       lmm_bytes, (int)sizeof(*lmm));
-                return -EINVAL;
-        }
+	if (lmm_bytes < sizeof(*lmm)) {
+		CERROR("lov_mds_md_v1 too small: %d, need at least %d\n",
+		       lmm_bytes, (int)sizeof(*lmm));
+		return -EINVAL;
+	}
 
-        *stripe_count = le16_to_cpu(lmm->lmm_stripe_count);
+	*stripe_count = le16_to_cpu(lmm->lmm_stripe_count);
+	if (le32_to_cpu(lmm->lmm_pattern) & LOV_PATTERN_F_RELEASED)
+		*stripe_count = 0;
 
-        if (lmm_bytes < lov_mds_md_size(*stripe_count, LOV_MAGIC_V1)) {
-                CERROR("LOV EA V1 too small: %d, need %d\n",
-                       lmm_bytes, lov_mds_md_size(*stripe_count, LOV_MAGIC_V1));
-                lov_dump_lmm_v1(D_WARNING, lmm);
-                return -EINVAL;
-        }
+	if (lmm_bytes < lov_mds_md_size(*stripe_count, LOV_MAGIC_V1)) {
+		CERROR("LOV EA V1 too small: %d, need %d\n",
+		       lmm_bytes, lov_mds_md_size(*stripe_count, LOV_MAGIC_V1));
+		lov_dump_lmm_common(D_WARNING, lmm);
+		return -EINVAL;
+	}
 
-        return lsm_lmm_verify_common(lmm, lmm_bytes, *stripe_count);
+	return lsm_lmm_verify_common(lmm, lmm_bytes, *stripe_count);
 }
 
 int lsm_unpackmd_v1(struct lov_obd *lov, struct lov_stripe_md *lsm,
@@ -219,18 +219,20 @@ int lsm_unpackmd_v1(struct lov_obd *lov, struct lov_stripe_md *lsm,
 {
         struct lov_oinfo *loi;
         int i;
+	int stripe_count;
         __u64 stripe_maxbytes = OBD_OBJECT_EOF;
 
         lsm_unpackmd_common(lsm, lmm);
 
-        for (i = 0; i < lsm->lsm_stripe_count; i++) {
-                /* XXX LOV STACKING call down to osc_unpackmd() */
-                loi = lsm->lsm_oinfo[i];
-                loi->loi_id = le64_to_cpu(lmm->lmm_objects[i].l_object_id);
-                loi->loi_seq = le64_to_cpu(lmm->lmm_objects[i].l_object_seq);
-                loi->loi_ost_idx = le32_to_cpu(lmm->lmm_objects[i].l_ost_idx);
-                loi->loi_ost_gen = le32_to_cpu(lmm->lmm_objects[i].l_ost_gen);
-                if (loi->loi_ost_idx >= lov->desc.ld_tgt_count) {
+	stripe_count = lsm_is_released(lsm) ? 0 : lsm->lsm_stripe_count;
+
+	for (i = 0; i < stripe_count; i++) {
+		/* XXX LOV STACKING call down to osc_unpackmd() */
+		loi = lsm->lsm_oinfo[i];
+		ostid_le_to_cpu(&lmm->lmm_objects[i].l_ost_oi, &loi->loi_oi);
+		loi->loi_ost_idx = le32_to_cpu(lmm->lmm_objects[i].l_ost_idx);
+		loi->loi_ost_gen = le32_to_cpu(lmm->lmm_objects[i].l_ost_gen);
+		if (loi->loi_ost_idx >= lov->desc.ld_tgt_count) {
                         CERROR("OST index %d more than OST count %d\n",
                                loi->loi_ost_idx, lov->desc.ld_tgt_count);
                         lov_dump_lmm_v1(D_WARNING, lmm);
@@ -246,9 +248,11 @@ int lsm_unpackmd_v1(struct lov_obd *lov, struct lov_stripe_md *lsm,
                                  &stripe_maxbytes);
         }
 
-        lsm->lsm_maxbytes = stripe_maxbytes * lsm->lsm_stripe_count;
+	lsm->lsm_maxbytes = stripe_maxbytes * lsm->lsm_stripe_count;
+	if (lsm->lsm_stripe_count == 0)
+		lsm->lsm_maxbytes = stripe_maxbytes * lov->desc.ld_tgt_count;
 
-        return 0;
+	return 0;
 }
 
 const struct lsm_operations lsm_v1_ops = {
@@ -263,27 +267,29 @@ const struct lsm_operations lsm_v1_ops = {
 static int lsm_lmm_verify_v3(struct lov_mds_md *lmmv1, int lmm_bytes,
                              __u16 *stripe_count)
 {
-        struct lov_mds_md_v3 *lmm;
+	struct lov_mds_md_v3 *lmm;
 
-        lmm = (struct lov_mds_md_v3 *)lmmv1;
+	lmm = (struct lov_mds_md_v3 *)lmmv1;
 
-        if (lmm_bytes < sizeof(*lmm)) {
-                CERROR("lov_mds_md_v3 too small: %d, need at least %d\n",
-                       lmm_bytes, (int)sizeof(*lmm));
-                return -EINVAL;
-        }
+	if (lmm_bytes < sizeof(*lmm)) {
+		CERROR("lov_mds_md_v3 too small: %d, need at least %d\n",
+		       lmm_bytes, (int)sizeof(*lmm));
+		return -EINVAL;
+	}
 
-        *stripe_count = le16_to_cpu(lmm->lmm_stripe_count);
+	*stripe_count = le16_to_cpu(lmm->lmm_stripe_count);
+	if (le32_to_cpu(lmm->lmm_pattern) & LOV_PATTERN_F_RELEASED)
+		*stripe_count = 0;
 
-        if (lmm_bytes < lov_mds_md_size(*stripe_count, LOV_MAGIC_V3)) {
-                CERROR("LOV EA V3 too small: %d, need %d\n",
-                       lmm_bytes, lov_mds_md_size(*stripe_count, LOV_MAGIC_V3));
-                lov_dump_lmm_v3(D_WARNING, lmm);
-                return -EINVAL;
-        }
+	if (lmm_bytes < lov_mds_md_size(*stripe_count, LOV_MAGIC_V3)) {
+		CERROR("LOV EA V3 too small: %d, need %d\n",
+		       lmm_bytes, lov_mds_md_size(*stripe_count, LOV_MAGIC_V3));
+		lov_dump_lmm_common(D_WARNING, lmm);
+		return -EINVAL;
+	}
 
-        return lsm_lmm_verify_common((struct lov_mds_md_v1 *)lmm, lmm_bytes,
-                                     *stripe_count);
+	return lsm_lmm_verify_common((struct lov_mds_md_v1 *)lmm, lmm_bytes,
+				     *stripe_count);
 }
 
 int lsm_unpackmd_v3(struct lov_obd *lov, struct lov_stripe_md *lsm,
@@ -292,22 +298,25 @@ int lsm_unpackmd_v3(struct lov_obd *lov, struct lov_stripe_md *lsm,
         struct lov_mds_md_v3 *lmm;
         struct lov_oinfo *loi;
         int i;
+	int stripe_count;
         __u64 stripe_maxbytes = OBD_OBJECT_EOF;
 	int cplen = 0;
 
         lmm = (struct lov_mds_md_v3 *)lmmv1;
 
         lsm_unpackmd_common(lsm, (struct lov_mds_md_v1 *)lmm);
+
+	stripe_count = lsm_is_released(lsm) ? 0 : lsm->lsm_stripe_count;
+
 	cplen = strlcpy(lsm->lsm_pool_name, lmm->lmm_pool_name,
 			sizeof(lsm->lsm_pool_name));
 	if (cplen >= sizeof(lsm->lsm_pool_name))
 		return -E2BIG;
 
-        for (i = 0; i < lsm->lsm_stripe_count; i++) {
+        for (i = 0; i < stripe_count; i++) {
                 /* XXX LOV STACKING call down to osc_unpackmd() */
                 loi = lsm->lsm_oinfo[i];
-                loi->loi_id = le64_to_cpu(lmm->lmm_objects[i].l_object_id);
-                loi->loi_seq = le64_to_cpu(lmm->lmm_objects[i].l_object_seq);
+		ostid_le_to_cpu(&lmm->lmm_objects[i].l_ost_oi, &loi->loi_oi);
                 loi->loi_ost_idx = le32_to_cpu(lmm->lmm_objects[i].l_ost_idx);
                 loi->loi_ost_gen = le32_to_cpu(lmm->lmm_objects[i].l_ost_gen);
                 if (loi->loi_ost_idx >= lov->desc.ld_tgt_count) {
@@ -326,9 +335,11 @@ int lsm_unpackmd_v3(struct lov_obd *lov, struct lov_stripe_md *lsm,
                                  &stripe_maxbytes);
         }
 
-        lsm->lsm_maxbytes = stripe_maxbytes * lsm->lsm_stripe_count;
+	lsm->lsm_maxbytes = stripe_maxbytes * lsm->lsm_stripe_count;
+	if (lsm->lsm_stripe_count == 0)
+		lsm->lsm_maxbytes = stripe_maxbytes * lov->desc.ld_tgt_count;
 
-        return 0;
+	return 0;
 }
 
 const struct lsm_operations lsm_v3_ops = {