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: wang di <di.wang@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6263
Reviewed-on: http://review.whamcloud.com/13817
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Fan Yong <fan.yong@intel.com>
Reviewed-by: Lai Siyao <lai.siyao@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/lmv/lmv_obd.c b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
index a0792d4817834294290e2589315175b3347de001..dad572eb76ece26cb8e053e33b95fc0ec7f37779 100644 (file)
--- a/drivers/staging/lustre/lustre/lmv/lmv_obd.c
+++ b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
@@ -1579,6 +1579,8 @@ lmv_locate_target_for_name(struct lmv_obd *lmv, struct lmv_stripe_md *lsm,
        struct lmv_tgt_desc *tgt;
 
        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];
        } else {
                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,
                        return ERR_CAST(oinfo);
        }
 
-       *fid = oinfo->lmo_fid;
-       *mds = oinfo->lmo_mds;
-       tgt = lmv_get_target(lmv, *mds, NULL);
+       if (fid)
+               *fid = oinfo->lmo_fid;
+       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;
 }
 
@@ -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) {
                LASSERTF(fid_is_sane(&op_data->op_fid3), "invalid FID "DFID"\n",
                         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);
                if (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 {
                if (op_data->op_mea1) {
                        struct lmv_stripe_md *lsm = op_data->op_mea1;