Commit a1194ad6 authored by wang di's avatar wang di Committed by Greg Kroah-Hartman

staging: lustre: lmv: fix parent FID for migration

If the migrating directory is under striped directory, it needs
to set right stripe FID for its parent.
Signed-off-by: default avatarwang di <di.wang@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6263
Reviewed-on: http://review.whamcloud.com/13817Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarFan Yong <fan.yong@intel.com>
Reviewed-by: default avatarLai Siyao <lai.siyao@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8ed62e91
...@@ -1579,6 +1579,8 @@ lmv_locate_target_for_name(struct lmv_obd *lmv, struct lmv_stripe_md *lsm, ...@@ -1579,6 +1579,8 @@ lmv_locate_target_for_name(struct lmv_obd *lmv, struct lmv_stripe_md *lsm,
struct lmv_tgt_desc *tgt; struct lmv_tgt_desc *tgt;
if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_BAD_NAME_HASH)) { if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_BAD_NAME_HASH)) {
if (cfs_fail_val >= lsm->lsm_md_stripe_count)
return ERR_PTR(-EBADF);
oinfo = &lsm->lsm_md_oinfo[cfs_fail_val]; oinfo = &lsm->lsm_md_oinfo[cfs_fail_val];
} else { } else {
oinfo = lsm_name_to_stripe_info(lsm, name, namelen); oinfo = lsm_name_to_stripe_info(lsm, name, namelen);
...@@ -1586,11 +1588,15 @@ lmv_locate_target_for_name(struct lmv_obd *lmv, struct lmv_stripe_md *lsm, ...@@ -1586,11 +1588,15 @@ lmv_locate_target_for_name(struct lmv_obd *lmv, struct lmv_stripe_md *lsm,
return ERR_CAST(oinfo); return ERR_CAST(oinfo);
} }
*fid = oinfo->lmo_fid; if (fid)
*mds = oinfo->lmo_mds; *fid = oinfo->lmo_fid;
tgt = lmv_get_target(lmv, *mds, NULL); if (mds)
*mds = oinfo->lmo_mds;
tgt = lmv_get_target(lmv, oinfo->lmo_mds, NULL);
CDEBUG(D_INFO, "locate on mds %u "DFID"\n", *mds, PFID(fid)); CDEBUG(D_INFO, "locate on mds %u " DFID "\n", oinfo->lmo_mds,
PFID(&oinfo->lmo_fid));
return tgt; return tgt;
} }
...@@ -1953,10 +1959,24 @@ static int lmv_rename(struct obd_export *exp, struct md_op_data *op_data, ...@@ -1953,10 +1959,24 @@ static int lmv_rename(struct obd_export *exp, struct md_op_data *op_data,
if (op_data->op_cli_flags & CLI_MIGRATE) { if (op_data->op_cli_flags & CLI_MIGRATE) {
LASSERTF(fid_is_sane(&op_data->op_fid3), "invalid FID "DFID"\n", LASSERTF(fid_is_sane(&op_data->op_fid3), "invalid FID "DFID"\n",
PFID(&op_data->op_fid3)); PFID(&op_data->op_fid3));
if (op_data->op_mea1) {
struct lmv_stripe_md *lsm = op_data->op_mea1;
struct lmv_tgt_desc *tmp;
/* Fix the parent fid for striped dir */
tmp = lmv_locate_target_for_name(lmv, lsm, old,
oldlen,
&op_data->op_fid1,
NULL);
if (IS_ERR(tmp))
return PTR_ERR(tmp);
}
rc = lmv_fid_alloc(NULL, exp, &op_data->op_fid2, op_data); rc = lmv_fid_alloc(NULL, exp, &op_data->op_fid2, op_data);
if (rc) if (rc)
return rc; return rc;
src_tgt = lmv_locate_mds(lmv, op_data, &op_data->op_fid3); src_tgt = lmv_find_target(lmv, &op_data->op_fid3);
} else { } else {
if (op_data->op_mea1) { if (op_data->op_mea1) {
struct lmv_stripe_md *lsm = op_data->op_mea1; struct lmv_stripe_md *lsm = op_data->op_mea1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment