- landed share_write_lock.patch from #7410

[fs/lustre-release.git] / lustre / cmobd / cm_oss_reint.c

diff --git a/lustre/cmobd/cm_oss_reint.c b/lustre/cmobd/cm_oss_reint.c
index 8f0dade..c460ffb 100644 (file)
--- a/lustre/cmobd/cm_oss_reint.c
+++ b/lustre/cmobd/cm_oss_reint.c
@@ -63,6 +63,7 @@ int cmobd_dummy_lsm(struct lov_stripe_md **lsmp, int stripe_cnt,
                         (*lsmp)->lsm_object_gr = oa->o_gr;
                 }
                 (*lsmp)->lsm_oinfo[i].loi_ost_idx = i;
+                (*lsmp)->lsm_oinfo[i].loi_ost_gen = 1;
                 (*lsmp)->lsm_stripe_size = stripe_size;
         }
         RETURN(0);
@@ -90,7 +91,7 @@ static int cmobd_setattr_reint(struct obd_device *obd, void *rec)
         if (rc)
                 GOTO(out, rc);
 
-        rc = obd_setattr(exp, oa, lsm, NULL);
+        rc = obd_setattr(exp, oa, lsm, NULL, NULL);
 
         cmobd_free_lsm(&lsm);
 out:
@@ -216,8 +217,7 @@ static int cmobd_write_extents(struct obd_device *obd, struct obdo *oa,
         /* XXX for debug write replay without smfs and kml */
         res_id.name[0]= oa->o_id;
         res_id.name[1]= oa->o_gr;
-        policy.l_extent.start = extent->start;
-        policy.l_extent.end = extent->end;
+        policy.l_extent = *extent;
         
         /* get extent read lock on the source replay file */
         rc = ldlm_cli_enqueue(NULL, NULL, cache->obd_namespace, res_id,