Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "b=19325 adjust waiting extent locks during 1st enqueue"
[fs/lustre-release.git]
/
lustre
/
lov
/
lov_request.c
diff --git
a/lustre/lov/lov_request.c
b/lustre/lov/lov_request.c
index
7c0e040
..
a6b3ade
100644
(file)
--- a/
lustre/lov/lov_request.c
+++ b/
lustre/lov/lov_request.c
@@
-343,7
+343,7
@@
int lov_prep_enqueue_set(struct obd_export *exp, struct obd_info *oinfo,
/* XXX LOV STACKING: submd should be from the subobj */
req->rq_oi.oi_md->lsm_object_id = loi->loi_id;
/* XXX LOV STACKING: submd should be from the subobj */
req->rq_oi.oi_md->lsm_object_id = loi->loi_id;
- req->rq_oi.oi_md->lsm_object_
gr = oinfo->oi_md->lsm_object_gr
;
+ req->rq_oi.oi_md->lsm_object_
seq = loi->loi_seq
;
req->rq_oi.oi_md->lsm_stripe_count = 0;
req->rq_oi.oi_md->lsm_oinfo[0]->loi_kms_valid =
loi->loi_kms_valid;
req->rq_oi.oi_md->lsm_stripe_count = 0;
req->rq_oi.oi_md->lsm_oinfo[0]->loi_kms_valid =
loi->loi_kms_valid;
@@
-453,7
+453,7
@@
int lov_prep_match_set(struct obd_export *exp, struct obd_info *oinfo,
/* XXX LOV STACKING: submd should be from the subobj */
req->rq_oi.oi_md->lsm_object_id = loi->loi_id;
/* XXX LOV STACKING: submd should be from the subobj */
req->rq_oi.oi_md->lsm_object_id = loi->loi_id;
- req->rq_oi.oi_md->lsm_object_
gr = lsm->lsm_object_gr
;
+ req->rq_oi.oi_md->lsm_object_
seq = loi->loi_seq
;
req->rq_oi.oi_md->lsm_stripe_count = 0;
lov_set_add_req(req, set);
req->rq_oi.oi_md->lsm_stripe_count = 0;
lov_set_add_req(req, set);
@@
-536,7
+536,7
@@
int lov_prep_cancel_set(struct obd_export *exp, struct obd_info *oinfo,
/* XXX LOV STACKING: submd should be from the subobj */
req->rq_oi.oi_md->lsm_object_id = loi->loi_id;
/* XXX LOV STACKING: submd should be from the subobj */
req->rq_oi.oi_md->lsm_object_id = loi->loi_id;
- req->rq_oi.oi_md->lsm_object_
gr = lsm->lsm_object_gr
;
+ req->rq_oi.oi_md->lsm_object_
seq = loi->loi_seq
;
req->rq_oi.oi_md->lsm_stripe_count = 0;
lov_set_add_req(req, set);
req->rq_oi.oi_md->lsm_stripe_count = 0;
lov_set_add_req(req, set);
@@
-605,7
+605,7
@@
static int create_done(struct obd_export *exp, struct lov_request_set *set,
LBUG();
}
ret_oa->o_id = src_oa->o_id;
LBUG();
}
ret_oa->o_id = src_oa->o_id;
- ret_oa->o_
gr = src_oa->o_gr
;
+ ret_oa->o_
seq = src_oa->o_seq
;
ret_oa->o_valid |= OBD_MD_FLID | OBD_MD_FLGROUP;
memcpy(src_oa, ret_oa, sizeof(*src_oa));
OBDO_FREE(ret_oa);
ret_oa->o_valid |= OBD_MD_FLID | OBD_MD_FLGROUP;
memcpy(src_oa, ret_oa, sizeof(*src_oa));
OBDO_FREE(ret_oa);
@@
-691,7
+691,7
@@
int lov_update_create_set(struct lov_request_set *set,
}
loi->loi_id = req->rq_oi.oi_oa->o_id;
}
loi->loi_id = req->rq_oi.oi_oa->o_id;
- loi->loi_
gr = req->rq_oi.oi_oa->o_gr
;
+ loi->loi_
seq = req->rq_oi.oi_oa->o_seq
;
loi->loi_ost_idx = req->rq_idx;
loi_init(loi);
loi->loi_ost_idx = req->rq_idx;
loi_init(loi);
@@
-915,6
+915,7
@@
int lov_prep_brw_set(struct obd_export *exp, struct obd_info *oinfo,
sizeof(*req->rq_oi.oi_oa));
}
req->rq_oi.oi_oa->o_id = loi->loi_id;
sizeof(*req->rq_oi.oi_oa));
}
req->rq_oi.oi_oa->o_id = loi->loi_id;
+ req->rq_oi.oi_oa->o_seq = loi->loi_seq;
req->rq_oi.oi_oa->o_stripe_idx = i;
req->rq_buflen = sizeof(*req->rq_oi.oi_md);
req->rq_oi.oi_oa->o_stripe_idx = i;
req->rq_buflen = sizeof(*req->rq_oi.oi_md);
@@
-930,7
+931,7
@@
int lov_prep_brw_set(struct obd_export *exp, struct obd_info *oinfo,
/* XXX LOV STACKING */
req->rq_oi.oi_md->lsm_object_id = loi->loi_id;
/* XXX LOV STACKING */
req->rq_oi.oi_md->lsm_object_id = loi->loi_id;
- req->rq_oi.oi_md->lsm_object_
gr = oinfo->oi_md->lsm_object_gr
;
+ req->rq_oi.oi_md->lsm_object_
seq = loi->loi_seq
;
req->rq_oabufs = info[i].count;
req->rq_pgaidx = shift;
shift += req->rq_oabufs;
req->rq_oabufs = info[i].count;
req->rq_pgaidx = shift;
shift += req->rq_oabufs;
@@
-1039,6
+1040,7
@@
int lov_prep_getattr_set(struct obd_export *exp, struct obd_info *oinfo,
memcpy(req->rq_oi.oi_oa, oinfo->oi_oa,
sizeof(*req->rq_oi.oi_oa));
req->rq_oi.oi_oa->o_id = loi->loi_id;
memcpy(req->rq_oi.oi_oa, oinfo->oi_oa,
sizeof(*req->rq_oi.oi_oa));
req->rq_oi.oi_oa->o_id = loi->loi_id;
+ req->rq_oi.oi_oa->o_seq = loi->loi_seq;
req->rq_oi.oi_cb_up = cb_getattr_update;
req->rq_oi.oi_capa = oinfo->oi_capa;
req->rq_oi.oi_cb_up = cb_getattr_update;
req->rq_oi.oi_capa = oinfo->oi_capa;
@@
-1117,6
+1119,7
@@
int lov_prep_destroy_set(struct obd_export *exp, struct obd_info *oinfo,
}
memcpy(req->rq_oi.oi_oa, src_oa, sizeof(*req->rq_oi.oi_oa));
req->rq_oi.oi_oa->o_id = loi->loi_id;
}
memcpy(req->rq_oi.oi_oa, src_oa, sizeof(*req->rq_oi.oi_oa));
req->rq_oi.oi_oa->o_id = loi->loi_id;
+ req->rq_oi.oi_oa->o_seq = loi->loi_seq;
lov_set_add_req(req, set);
}
if (!set->set_count)
lov_set_add_req(req, set);
}
if (!set->set_count)
@@
-1228,6
+1231,7
@@
int lov_prep_setattr_set(struct obd_export *exp, struct obd_info *oinfo,
memcpy(req->rq_oi.oi_oa, oinfo->oi_oa,
sizeof(*req->rq_oi.oi_oa));
req->rq_oi.oi_oa->o_id = loi->loi_id;
memcpy(req->rq_oi.oi_oa, oinfo->oi_oa,
sizeof(*req->rq_oi.oi_oa));
req->rq_oi.oi_oa->o_id = loi->loi_id;
+ req->rq_oi.oi_oa->o_seq= loi->loi_seq;
req->rq_oi.oi_oa->o_stripe_idx = i;
req->rq_oi.oi_cb_up = cb_setattr_update;
req->rq_oi.oi_capa = oinfo->oi_capa;
req->rq_oi.oi_oa->o_stripe_idx = i;
req->rq_oi.oi_cb_up = cb_setattr_update;
req->rq_oi.oi_capa = oinfo->oi_capa;
@@
-1361,7
+1365,7
@@
int lov_prep_punch_set(struct obd_export *exp, struct obd_info *oinfo,
memcpy(req->rq_oi.oi_oa, oinfo->oi_oa,
sizeof(*req->rq_oi.oi_oa));
req->rq_oi.oi_oa->o_id = loi->loi_id;
memcpy(req->rq_oi.oi_oa, oinfo->oi_oa,
sizeof(*req->rq_oi.oi_oa));
req->rq_oi.oi_oa->o_id = loi->loi_id;
- req->rq_oi.oi_oa->o_
gr = loi->loi_gr
;
+ req->rq_oi.oi_oa->o_
seq = loi->loi_seq
;
req->rq_oi.oi_oa->o_valid |= OBD_MD_FLGROUP;
req->rq_oi.oi_oa->o_stripe_idx = i;
req->rq_oi.oi_oa->o_valid |= OBD_MD_FLGROUP;
req->rq_oi.oi_oa->o_stripe_idx = i;
@@
-1450,6
+1454,7
@@
int lov_prep_sync_set(struct obd_export *exp, struct obd_info *oinfo,
}
memcpy(req->rq_oi.oi_oa, src_oa, sizeof(*req->rq_oi.oi_oa));
req->rq_oi.oi_oa->o_id = loi->loi_id;
}
memcpy(req->rq_oi.oi_oa, src_oa, sizeof(*req->rq_oi.oi_oa));
req->rq_oi.oi_oa->o_id = loi->loi_id;
+ req->rq_oi.oi_oa->o_seq = loi->loi_seq;
req->rq_oi.oi_oa->o_stripe_idx = i;
req->rq_oi.oi_policy.l_extent.start = rs;
req->rq_oi.oi_oa->o_stripe_idx = i;
req->rq_oi.oi_policy.l_extent.start = rs;