LU-4543 osd: return actual hash value for a record

[fs/lustre-release.git] / lustre / osd-zfs / osd_oi.c

diff --git a/lustre/osd-zfs/osd_oi.c b/lustre/osd-zfs/osd_oi.c
index 3c6f906..4acbd0d 100644 (file)
--- a/lustre/osd-zfs/osd_oi.c
+++ b/lustre/osd-zfs/osd_oi.c
@@ -211,7 +211,6 @@ int osd_fld_lookup(const struct lu_env *env, struct osd_device *osd,
                   obd_seq seq, struct lu_seq_range *range)
 {
        struct seq_server_site  *ss = osd_seq_site(osd);
-       int                     rc;
 
        if (fid_seq_is_idif(seq)) {
                fld_range_set_ost(range);
@@ -230,16 +229,15 @@ int osd_fld_lookup(const struct lu_env *env, struct osd_device *osd,
 
        LASSERT(ss != NULL);
        fld_range_set_any(range);
-       rc = fld_server_lookup(env, ss->ss_server_fld, seq, range);
-       if (rc != 0)
-               CERROR("%s: cannot find FLD range for "LPX64": rc = %d\n",
-                      osd_name(osd), seq, rc);
-       return rc;
+       /* OSD will only do local fld lookup */
+       return fld_local_lookup(env, ss->ss_server_fld, seq, range);
 }
 
 int fid_is_on_ost(const struct lu_env *env, struct osd_device *osd,
                  const struct lu_fid *fid)
 {
+       struct lu_seq_range     *range = &osd_oti_get(env)->oti_seq_range;
+       int                     rc;
        ENTRY;
 
        if (fid_is_idif(fid))
@@ -249,7 +247,15 @@ int fid_is_on_ost(const struct lu_env *env, struct osd_device *osd,
                     fid_is_name_llog(fid) || fid_is_quota(fid))
                RETURN(0);
 
-       if (osd->od_is_ost)
+       rc = osd_fld_lookup(env, osd, fid_seq(fid), range);
+       if (rc != 0) {
+               if (rc != -ENOENT)
+                       CERROR("%s: "DFID" lookup failed: rc = %d\n",
+                              osd_name(osd), PFID(fid), rc);
+               RETURN(0);
+       }
+
+       if (fld_range_is_ost(range))
                RETURN(1);
 
        RETURN(0);
@@ -365,6 +371,7 @@ osd_get_idx_for_ost_obj(const struct lu_env *env, struct osd_device *osd,
 {
        struct osd_seq  *osd_seq;
        unsigned long   b;
+       obd_id          id;
        int             rc;
 
        osd_seq = osd_find_or_add_seq(env, osd, fid_seq(fid));
@@ -374,12 +381,18 @@ osd_get_idx_for_ost_obj(const struct lu_env *env, struct osd_device *osd,
                return PTR_ERR(osd_seq);
        }
 
-       rc = fid_to_ostid(fid, &osd_oti_get(env)->oti_ostid);
-       LASSERT(rc == 0); /* we should not get here with IGIF */
-       b = ostid_id(&osd_oti_get(env)->oti_ostid) % OSD_OST_MAP_SIZE;
+       if (fid_is_last_id(fid)) {
+               id = 0;
+       } else {
+               rc = fid_to_ostid(fid, &osd_oti_get(env)->oti_ostid);
+               LASSERT(rc == 0); /* we should not get here with IGIF */
+               id = ostid_id(&osd_oti_get(env)->oti_ostid);
+       }
+
+       b = id % OSD_OST_MAP_SIZE;
        LASSERT(osd_seq->os_compat_dirs[b]);
 
-       sprintf(buf, LPU64, ostid_id(&osd_oti_get(env)->oti_ostid));
+       sprintf(buf, LPU64, id);
 
        return osd_seq->os_compat_dirs[b];
 }