b=19427 correct lmm_object_id and reserve fids for fid-on-OST.

[fs/lustre-release.git] / lustre / mds / mds_lov.c

diff --git a/lustre/mds/mds_lov.c b/lustre/mds/mds_lov.c
index 5ace81b..66a037a 100644 (file)
--- a/lustre/mds/mds_lov.c
+++ b/lustre/mds/mds_lov.c
@@ -281,7 +281,7 @@ static int mds_log_lost_precreated(struct obd_device *obd,
         }
 
         lsm->lsm_oinfo[0]->loi_id = id;
-        lsm->lsm_oinfo[0]->loi_gr = mdt_to_obd_objgrp(obd->u.mds.mds_id);
+        lsm->lsm_oinfo[0]->loi_seq = mdt_to_obd_objseq(obd->u.mds.mds_id);
         lsm->lsm_oinfo[0]->loi_ost_idx = idx;
 
         rc = mds_log_op_orphan(obd, lsm, count);
@@ -526,7 +526,7 @@ int mds_lov_clear_orphans(struct mds_obd *mds, struct obd_uuid *ost_uuid)
          * objects above this ID, they will be removed. */
         memset(&oa, 0, sizeof(oa));
         oa.o_flags = OBD_FL_DELORPHAN;
-        oa.o_gr = mdt_to_obd_objgrp(mds->mds_id);
+        oa.o_seq = mdt_to_obd_objseq(mds->mds_id);
         oa.o_valid = OBD_MD_FLFLAGS | OBD_MD_FLGROUP;
         if (ost_uuid != NULL)
                 oti.oti_ost_uuid = ost_uuid;
@@ -720,7 +720,7 @@ int mds_lov_connect(struct obd_device *obd, char * lov_name)
         data->ocd_connect_flags |= OBD_CONNECT_LRU_RESIZE;
 #endif
         data->ocd_version = LUSTRE_VERSION_CODE;
-        data->ocd_group = mdt_to_obd_objgrp(mds->mds_id);
+        data->ocd_group = mdt_to_obd_objseq(mds->mds_id);
         /* send max bytes per rpc */
         data->ocd_brw_size = PTLRPC_MAX_BRW_PAGES << CFS_PAGE_SHIFT;
         /* send the list of supported checksum types */
@@ -844,7 +844,7 @@ static int __mds_lov_synchronize(void *data)
                 CERROR("%s failed at update_mds: %d\n", obd_uuid2str(uuid), rc);
                 GOTO(out, rc);
         }
-        mgi.group = mdt_to_obd_objgrp(mds->mds_id);
+        mgi.group = mdt_to_obd_objseq(mds->mds_id);
         mgi.uuid = uuid;
 
         rc = obd_set_info_async(mds->mds_osc_exp, sizeof(KEY_MDS_CONN),