LU-5051 hsm: do not reallocate hsm receive buffer

[fs/lustre-release.git] / lustre / ofd / ofd_lvb.c

diff --git a/lustre/ofd/ofd_lvb.c b/lustre/ofd/ofd_lvb.c
index 7f41854..3105174 100644 (file)
--- a/lustre/ofd/ofd_lvb.c
+++ b/lustre/ofd/ofd_lvb.c
@@ -64,7 +64,7 @@ static int ofd_lvbo_init(struct ldlm_resource *res)
        ENTRY;
 
        LASSERT(res);
-       LASSERT_MUTEX_LOCKED(&res->lr_lvb_mutex);
+       LASSERT(mutex_is_locked(&res->lr_lvb_mutex));
 
        if (res->lr_lvb_data != NULL)
                RETURN(0);
@@ -87,7 +87,8 @@ static int ofd_lvbo_init(struct ldlm_resource *res)
        res->lr_lvb_len = sizeof(*lvb);
 
        info = ofd_info_init(&env, NULL);
-       ost_fid_from_resid(&info->fti_fid, &res->lr_name);
+       ost_fid_from_resid(&info->fti_fid, &res->lr_name,
+                          ofd->ofd_lut.lut_lsd.lsd_osd_index);
        fo = ofd_object_find(&env, ofd, &info->fti_fid);
        if (IS_ERR(fo))
                GOTO(out_lvb, rc = PTR_ERR(fo));
@@ -153,7 +154,7 @@ static int ofd_lvbo_update(struct ldlm_resource *res,
        lvb = res->lr_lvb_data;
        if (lvb == NULL) {
                CERROR("%s: no LVB data for "DFID"\n",
-                      ofd_obd(ofd)->obd_name, PFID(&info->fti_fid));
+                      ofd_name(ofd), PFID(&info->fti_fid));
                GOTO(out_env, rc = 0);
        }
 
@@ -224,7 +225,8 @@ static int ofd_lvbo_update(struct ldlm_resource *res,
 
 disk_update:
        /* Update the LVB from the disk inode */
-       ost_fid_from_resid(&info->fti_fid, &res->lr_name);
+       ost_fid_from_resid(&info->fti_fid, &res->lr_name,
+                          ofd->ofd_lut.lut_lsd.lsd_osd_index);
        fo = ofd_object_find(&env, ofd, &info->fti_fid);
        if (IS_ERR(fo))
                GOTO(out_env, rc = PTR_ERR(fo));