X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flod%2Flod_lov.c;h=fefa3c72bd79d1e0e07890421ca54e0e9e9f2c11;hb=a585b03a36e61b9039f87135e1542094ae0d6e28;hp=37a5809797bf02603d9ff9a1acd16880fdd5092b;hpb=27f77f5de6fe27611c9f819f8cdaba89d70f15d9;p=fs%2Flustre-release.git

diff --git a/lustre/lod/lod_lov.c b/lustre/lod/lod_lov.c
index 37a5809..fefa3c7 100644
--- a/lustre/lod/lod_lov.c
+++ b/lustre/lod/lod_lov.c
@@ -243,8 +243,7 @@ int lod_add_device(const struct lu_env *env, struct lod_device *lod,
 					   OBD_CONNECT_MDS_MDS |
 					   OBD_CONNECT_FID |
 					   OBD_CONNECT_AT |
-					   OBD_CONNECT_FULL20 |
-					   OBD_CONNECT_PINGLESS;
+					   OBD_CONNECT_FULL20;
 		/* XXX set MDS-MDS flags, remove this when running this
 		 * on client*/
 		data->ocd_connect_flags |= OBD_CONNECT_MDS_MDS;
@@ -266,7 +265,7 @@ int lod_add_device(const struct lu_env *env, struct lod_device *lod,
 	}
 
 	LASSERT(obd->obd_lu_dev);
-	LASSERT(obd->obd_lu_dev->ld_site = lod->lod_dt_dev.dd_lu_dev.ld_site);
+	LASSERT(obd->obd_lu_dev->ld_site == lod->lod_dt_dev.dd_lu_dev.ld_site);
 
 	ldev = obd->obd_lu_dev;
 	d = lu2dt_dev(ldev);
@@ -519,8 +518,8 @@ int lod_generate_and_set_lovea(const struct lu_env *env,
 
 	lmm->lmm_magic = cpu_to_le32(magic);
 	lmm->lmm_pattern = cpu_to_le32(LOV_PATTERN_RAID0);
-	fid_ostid_pack(fid, &lmm->lmm_oi);
-	ostid_cpu_to_le(&lmm->lmm_oi, &lmm->lmm_oi);
+	fid_to_lmm_oi(fid, &lmm->lmm_oi);
+	lmm_oi_cpu_to_le(&lmm->lmm_oi, &lmm->lmm_oi);
 	lmm->lmm_stripe_size = cpu_to_le32(lo->ldo_stripe_size);
 	lmm->lmm_stripe_count = cpu_to_le16(lo->ldo_stripenr);
 	lmm->lmm_layout_gen = 0;
@@ -544,7 +543,7 @@ int lod_generate_and_set_lovea(const struct lu_env *env,
 		LASSERT(lo->ldo_stripe[i]);
 		fid = lu_object_fid(&lo->ldo_stripe[i]->do_lu);
 
-		rc = fid_ostid_pack(fid, &info->lti_ostid);
+		rc = fid_to_ostid(fid, &info->lti_ostid);
 		LASSERT(rc == 0);
 
 		ostid_cpu_to_le(&info->lti_ostid, &objs[i].l_ost_oi);
@@ -692,7 +691,9 @@ int lod_initialize_objects(const struct lu_env *env, struct lod_object *lo,
 	for (i = 0; i < lo->ldo_stripenr; i++) {
 		ostid_le_to_cpu(&objs[i].l_ost_oi, &info->lti_ostid);
 		idx = le64_to_cpu(objs[i].l_ost_idx);
-		fid_ostid_unpack(&info->lti_fid, &info->lti_ostid, idx);
+		rc = ostid_to_fid(&info->lti_fid, &info->lti_ostid, idx);
+		if (rc != 0)
+			GOTO(out, rc);
 		LASSERTF(fid_is_sane(&info->lti_fid), ""DFID" insane!\n",
 			 PFID(&info->lti_fid));
 		/*