LU-13437 llite: pass name in getattr by FID

[fs/lustre-release.git] / lustre / lmv / lmv_intent.c

diff --git a/lustre/lmv/lmv_intent.c b/lustre/lmv/lmv_intent.c
index 7c75c75..9990a5f 100644 (file)
--- a/lustre/lmv/lmv_intent.c
+++ b/lustre/lmv/lmv_intent.c
@@ -443,13 +443,29 @@ lmv_intent_lookup(struct obd_export *exp, struct md_op_data *op_data,
        }
 
 retry:
-       if (op_data->op_name) {
+       if (op_data->op_flags & MF_GETATTR_BY_FID) {
+               /* getattr by FID, replace fid1 with stripe FID */
+               LASSERT(op_data->op_name);
+               tgt = lmv_locate_tgt(lmv, op_data);
+               if (IS_ERR(tgt))
+                       RETURN(PTR_ERR(tgt));
+
+               /* name is used to locate stripe target, clear it here
+                * to avoid packing name in request, so that MDS knows
+                * it's getattr by FID.
+                */
+               op_data->op_name = NULL;
+               op_data->op_namelen = 0;
+
+               /* getattr request is sent to MDT where fid2 inode is */
+               tgt = lmv_fid2tgt(lmv, &op_data->op_fid2);
+       } else if (op_data->op_name) {
+               /* getattr by 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 {
+               /* old way to getattr by FID, parent FID not packed */
                tgt = lmv_fid2tgt(lmv, &op_data->op_fid1);
        }
        if (IS_ERR(tgt))