LU-11047 mdt: standardize mdt object locking

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

diff --git a/lustre/mdt/mdt_hsm.c b/lustre/mdt/mdt_hsm.c
index 6617277..56d9a3a 100644 (file)
--- a/lustre/mdt/mdt_hsm.c
+++ b/lustre/mdt/mdt_hsm.c
@@ -241,8 +241,8 @@ int mdt_hsm_state_get(struct tgt_session_info *tsi)
                GOTO(out, rc = err_serious(rc));
 
        lh = &info->mti_lh[MDT_LH_CHILD];
-       mdt_lock_reg_init(lh, LCK_PR);
-       rc = mdt_object_lock(info, obj, lh, MDS_INODELOCK_LOOKUP);
+       rc = mdt_object_lock(info, obj, lh, MDS_INODELOCK_LOOKUP, LCK_PR,
+                            false);
        if (rc < 0)
                GOTO(out_ucred, rc);
 
@@ -301,9 +301,8 @@ int mdt_hsm_state_set(struct tgt_session_info *tsi)
                GOTO(out, rc = err_serious(rc));
 
        lh = &info->mti_lh[MDT_LH_CHILD];
-       mdt_lock_reg_init(lh, LCK_PW);
        rc = mdt_object_lock(info, obj, lh, MDS_INODELOCK_LOOKUP |
-                            MDS_INODELOCK_XATTR);
+                            MDS_INODELOCK_XATTR, LCK_PW, false);
        if (rc < 0)
                GOTO(out_ucred, rc);