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;
}
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);
lmm->lmm_magic = cpu_to_le32(magic);
lmm->lmm_pattern = cpu_to_le32(LOV_PATTERN_RAID0);
- lmm->lmm_object_id = cpu_to_le64(fid_ver_oid(fid));
- lmm->lmm_object_seq = cpu_to_le64(fid_seq(fid));
+ 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);
- objs[i].l_object_id = cpu_to_le64(info->lti_ostid.oi_id);
- objs[i].l_object_seq = cpu_to_le64(info->lti_ostid.oi_seq);
+ ostid_cpu_to_le(&info->lti_ostid, &objs[i].l_ost_oi);
objs[i].l_ost_gen = cpu_to_le32(0);
rc = lod_fld_lookup(env, lod, fid, &index, LU_SEQ_RANGE_OST);
if (rc < 0) {
v3->lmm_magic = cpu_to_le32(LOV_MAGIC_V3);
v3->lmm_pattern = cpu_to_le32(LOV_PATTERN_RAID0);
- v3->lmm_object_id = 0;
- v3->lmm_object_seq = 0;
v3->lmm_stripe_size = cpu_to_le32(lo->ldo_def_stripe_size);
v3->lmm_stripe_count = cpu_to_le16(lo->ldo_def_stripenr);
v3->lmm_stripe_offset = cpu_to_le16(lo->ldo_def_stripe_offset);
struct lod_device *md = lu2lod_dev(lo->ldo_obj.do_lu.lo_dev);
struct lu_object *o, *n;
struct lu_device *nd;
- int i, idx, rc = 0;
+ struct dt_object **stripe;
+ int stripe_len;
+ int i, idx, rc = 0;
ENTRY;
LASSERT(lo);
LASSERT(lo->ldo_stripenr > 0);
LASSERT(lo->ldo_stripe_size > 0);
- i = sizeof(struct dt_object *) * lo->ldo_stripenr;
- OBD_ALLOC(lo->ldo_stripe, i);
- if (lo->ldo_stripe == NULL)
- GOTO(out, rc = -ENOMEM);
- lo->ldo_stripes_allocated = lo->ldo_stripenr;
+ stripe_len = lo->ldo_stripenr;
+ OBD_ALLOC(stripe, sizeof(stripe[0]) * stripe_len);
+ if (stripe == NULL)
+ RETURN(-ENOMEM);
for (i = 0; i < lo->ldo_stripenr; i++) {
- info->lti_ostid.oi_id = le64_to_cpu(objs[i].l_object_id);
- info->lti_ostid.oi_seq = le64_to_cpu(objs[i].l_object_seq);
+ 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));
/*
n = lu_object_locate(o->lo_header, nd->ld_type);
LASSERT(n);
- lo->ldo_stripe[i] = container_of(n, struct dt_object, do_lu);
+ stripe[i] = container_of(n, struct dt_object, do_lu);
}
out:
+ if (rc != 0) {
+ for (i = 0; i < stripe_len; i++)
+ if (stripe[i] != NULL)
+ lu_object_put(env, &stripe[i]->do_lu);
+
+ OBD_FREE(stripe, sizeof(stripe[0]) * stripe_len);
+ } else {
+ lo->ldo_stripe = stripe;
+ lo->ldo_stripes_allocated = stripe_len;
+ }
+
RETURN(rc);
}