X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosd-zfs%2Fosd_oi.c;h=ad6a1252876c15e19e6214719d7b2086e2f15fdb;hp=8b780fc57e6eaad261490739bd88d161bfec3168;hb=6794d7654b4c459519a9e6d85ed439c8c594c2e7;hpb=43f5fe89a53ffe8da2e1ff93f63d55851490d930 diff --git a/lustre/osd-zfs/osd_oi.c b/lustre/osd-zfs/osd_oi.c index 8b780fc..ad6a1252 100644 --- a/lustre/osd-zfs/osd_oi.c +++ b/lustre/osd-zfs/osd_oi.c @@ -396,12 +396,13 @@ osd_get_idx_for_ost_obj(const struct lu_env *env, struct osd_device *osd, PFID(fid)); return PTR_ERR(osd_seq); } - rc = fid_ostid_pack(fid, &osd_oti_get(env)->oti_ostid); + + rc = fid_to_ostid(fid, &osd_oti_get(env)->oti_ostid); LASSERT(rc == 0); /* we should not get here with IGIF */ - b = osd_oti_get(env)->oti_ostid.oi_id % OSD_OST_MAP_SIZE; + b = ostid_id(&osd_oti_get(env)->oti_ostid) % OSD_OST_MAP_SIZE; LASSERT(osd_seq->os_compat_dirs[b]); - sprintf(buf, LPU64, osd_oti_get(env)->oti_ostid.oi_id); + sprintf(buf, LPU64, ostid_id(&osd_oti_get(env)->oti_ostid)); return osd_seq->os_compat_dirs[b]; }