LASSERT(fid_is_sane(&body->mbo_fid1));
- tgt = lmv_find_target(lmv, &body->mbo_fid1);
+ tgt = lmv_fid2tgt(lmv, &body->mbo_fid1);
if (IS_ERR(tgt))
GOTO(out, rc = PTR_ERR(tgt));
op_data->op_bias = MDS_CROSS_REF;
CDEBUG(D_INODE, "REMOTE_INTENT with fid="DFID" -> mds #%u\n",
- PFID(&body->mbo_fid1), tgt->ltd_idx);
+ PFID(&body->mbo_fid1), tgt->ltd_index);
/* ask for security context upon intent */
if (it->it_op & (IT_LOOKUP | IT_GETATTR | IT_OPEN) &&
}
int lmv_revalidate_slaves(struct obd_export *exp,
+ const struct lu_fid *pfid,
const struct lmv_stripe_md *lsm,
ldlm_blocking_callback cb_blocking,
int extra_lock_flags)
* which is not needed here.
*/
memset(op_data, 0, sizeof(*op_data));
- op_data->op_fid1 = fid;
+ op_data->op_fid1 = *pfid;
op_data->op_fid2 = fid;
- tgt = lmv_get_target(lmv, lsm->lsm_md_oinfo[i].lmo_mds, NULL);
- if (IS_ERR(tgt))
- GOTO(cleanup, rc = PTR_ERR(tgt));
+ tgt = lmv_tgt(lmv, lsm->lsm_md_oinfo[i].lmo_mds);
+ if (!tgt)
+ GOTO(cleanup, rc = -ENODEV);
CDEBUG(D_INODE, "Revalidate slave "DFID" -> mds #%u\n",
- PFID(&fid), tgt->ltd_idx);
+ PFID(&fid), tgt->ltd_index);
if (req != NULL) {
ptlrpc_req_finished(req);
if (lmv_dir_bad_hash(op_data->op_mea1))
RETURN(-EBADF);
- if (lmv_dir_migrating(op_data->op_mea1)) {
+ if (lmv_dir_layout_changing(op_data->op_mea1)) {
if (flags & O_EXCL) {
/*
* open(O_CREAT | O_EXCL) needs to check
* existing name, which should be done on both
- * old and new layout, to avoid creating new
- * file under old layout, check old layout on
+ * old and new layout, check old layout on
* client side.
*/
- tgt = lmv_locate_tgt(lmv, op_data);
- if (IS_ERR(tgt))
- RETURN(PTR_ERR(tgt));
-
- rc = md_getattr_name(tgt->ltd_exp, op_data,
- reqp);
- if (!rc) {
- ptlrpc_req_finished(*reqp);
- *reqp = NULL;
- RETURN(-EEXIST);
- }
-
+ rc = lmv_old_layout_lookup(lmv, op_data);
if (rc != -ENOENT)
RETURN(rc);
- op_data->op_post_migrate = true;
+ op_data->op_new_layout = true;
} else {
/*
* open(O_CREAT) will be sent to MDT in old
if (lmv_dir_striped(op_data->op_mea1))
op_data->op_fid1 = op_data->op_fid2;
- tgt = lmv_find_target(lmv, &op_data->op_fid2);
+ tgt = lmv_fid2tgt(lmv, &op_data->op_fid2);
if (IS_ERR(tgt))
RETURN(PTR_ERR(tgt));
- op_data->op_mds = tgt->ltd_idx;
+ op_data->op_mds = tgt->ltd_index;
} else {
LASSERT(fid_is_sane(&op_data->op_fid1));
- LASSERT(fid_is_zero(&op_data->op_fid2));
+ LASSERT(it->it_flags & MDS_OPEN_PCC ||
+ fid_is_zero(&op_data->op_fid2));
LASSERT(op_data->op_name != NULL);
tgt = lmv_locate_tgt(lmv, op_data);
/* If it is ready to open the file by FID, do not need
* allocate FID at all, otherwise it will confuse MDT */
- if ((it->it_op & IT_CREAT) && !(it->it_flags & MDS_OPEN_BY_FID)) {
+ if ((it->it_op & IT_CREAT) && !(it->it_flags & MDS_OPEN_BY_FID ||
+ it->it_flags & MDS_OPEN_PCC)) {
/*
* For lookup(IT_CREATE) cases allocate new fid and setup FLD
* for it.
CDEBUG(D_INODE, "OPEN_INTENT with fid1="DFID", fid2="DFID","
" name='%s' -> mds #%u\n", PFID(&op_data->op_fid1),
- PFID(&op_data->op_fid2), op_data->op_name, tgt->ltd_idx);
+ PFID(&op_data->op_fid2), op_data->op_name, tgt->ltd_index);
rc = md_intent_lock(tgt->ltd_exp, op_data, it, reqp, cb_blocking,
extra_lock_flags);
}
retry:
- tgt = lmv_locate_tgt(lmv, op_data);
+ if (op_data->op_name) {
+ tgt = lmv_locate_tgt(lmv, op_data);
+ if (!fid_is_sane(&op_data->op_fid2))
+ fid_zero(&op_data->op_fid2);
+ } else if (fid_is_sane(&op_data->op_fid2)) {
+ tgt = lmv_fid2tgt(lmv, &op_data->op_fid2);
+ } else {
+ tgt = lmv_fid2tgt(lmv, &op_data->op_fid1);
+ }
if (IS_ERR(tgt))
RETURN(PTR_ERR(tgt));
- if (!fid_is_sane(&op_data->op_fid2))
- fid_zero(&op_data->op_fid2);
-
CDEBUG(D_INODE, "LOOKUP_INTENT with fid1="DFID", fid2="DFID
", name='%s' -> mds #%u\n",
PFID(&op_data->op_fid1), PFID(&op_data->op_fid2),
op_data->op_name ? op_data->op_name : "<NULL>",
- tgt->ltd_idx);
+ tgt->ltd_index);
op_data->op_bias &= ~MDS_CROSS_REF;
/* If RPC happens, lsm information will be revalidated
* during update_inode process (see ll_update_lsm_md) */
if (lmv_dir_striped(op_data->op_mea2)) {
- rc = lmv_revalidate_slaves(exp, op_data->op_mea2,
+ rc = lmv_revalidate_slaves(exp, &op_data->op_fid2,
+ op_data->op_mea2,
cb_blocking,
extra_lock_flags);
if (rc != 0)