Restore build after a tag crossed imaginary line. tag 2.3.56

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

diff --git a/lustre/osd-zfs/osd_index.c b/lustre/osd-zfs/osd_index.c
index d9195a5..44ee79f 100644 (file)
--- a/lustre/osd-zfs/osd_index.c
+++ b/lustre/osd-zfs/osd_index.c
@@ -468,18 +468,18 @@ struct osd_object *osd_object_find(const struct lu_env *env,
                else
                        LU_OBJECT_DEBUG(D_ERROR, env, luch,
                                        "%s: object can't be located "DFID"\n",
-                                       ludev->ld_obd->obd_name, PFID(fid));
+                                       osd_dev(ludev)->od_svname, PFID(fid));
 
                if (child == NULL) {
                        lu_object_put(env, luch);
                        CERROR("%s: Unable to get osd_object "DFID"\n",
-                              ludev->ld_obd->obd_name, PFID(fid));
+                              osd_dev(ludev)->od_svname, PFID(fid));
                        child = ERR_PTR(-ENOENT);
                }
        } else {
                LU_OBJECT_DEBUG(D_ERROR, env, luch,
                                "%s: lu_object does not exists "DFID"\n",
-                               ludev->ld_obd->obd_name, PFID(fid));
+                               osd_dev(ludev)->od_svname, PFID(fid));
                lu_object_put(env, luch);
                child = ERR_PTR(-ENOENT);
        }
@@ -536,7 +536,7 @@ static int osd_dir_insert(const struct lu_env *env, struct dt_object *dt,
         * zfs_readdir() generates ./.. on fly, but
         * we want own entries (.. at least) with a fid
         */
-#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 3, 55, 0)
+#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 3, 57, 0)
 #warning "fix '.' and '..' handling"
 #endif