LU-15527 dne: refactor commit-on-sharing for DNE

[fs/lustre-release.git] / lustre / mdt / mdt_restripe.c

diff --git a/lustre/mdt/mdt_restripe.c b/lustre/mdt/mdt_restripe.c
index 811e8cc..e09645e 100644 (file)
--- a/lustre/mdt/mdt_restripe.c
+++ b/lustre/mdt/mdt_restripe.c
@@ -278,7 +278,7 @@ static int mdt_auto_split(struct mdt_thread_info *info)
        struct mdt_object *parent = NULL;
        struct mdt_object *child = NULL;
        struct mdt_object *stripe = NULL;
-       struct ldlm_enqueue_info *einfo = &info->mti_einfo[0];
+       struct ldlm_enqueue_info *einfo = &info->mti_einfo;
        struct mdt_lock_handle *lhp;
        struct mdt_lock_handle *lhc;
        u32 lmv_stripe_count = 0;
@@ -389,13 +389,13 @@ static int mdt_auto_split(struct mdt_thread_info *info)
                GOTO(restriping_clear, rc);
 
        lhp = &info->mti_lh[MDT_LH_PARENT];
-       rc = mdt_parent_lock(info, parent, lhp, lname, LCK_PW, true);
+       rc = mdt_parent_lock(info, parent, lhp, lname, LCK_PW);
        if (rc)
                GOTO(restriping_clear, rc);
 
        lhc = &info->mti_lh[MDT_LH_CHILD];
        rc = mdt_object_stripes_lock(info, parent, child, lhc, einfo,
-                                    MDS_INODELOCK_FULL, LCK_EX, true);
+                                    MDS_INODELOCK_FULL, LCK_EX);
        if (rc)
                GOTO(unlock_parent, rc);
 
@@ -458,8 +458,7 @@ static int mdt_restripe_migrate_finish(struct mdt_thread_info *info,
        buf.lb_len = sizeof(*lmv);
 
        lh = &info->mti_lh[MDT_LH_PARENT];
-       rc = mdt_object_lock(info, stripe, lh, MDS_INODELOCK_XATTR, LCK_EX,
-                            false);
+       rc = mdt_object_lock(info, stripe, lh, MDS_INODELOCK_XATTR, LCK_EX);
        if (!rc)
                rc = mo_xattr_set(info->mti_env, mdt_object_child(stripe), &buf,
                                  XATTR_NAME_LMV, LU_XATTR_REPLACE);