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;
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;
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);
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));
/*