LU-4423 lnet: Drop unnecessary wrapper function in lnetselftest console.c

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

diff --git a/lustre/mdt/mdt_hsm.c b/lustre/mdt/mdt_hsm.c
index 5261799..d4cf668 100644 (file)
--- a/lustre/mdt/mdt_hsm.c
+++ b/lustre/mdt/mdt_hsm.c
@@ -22,9 +22,9 @@
 /*
  * Copyright (c) 2011, 2012 Commissariat a l'energie atomique et aux energies
  *                          alternatives
- *
- * Copyright (c) 2012, 2014, Intel Corporation.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, 2015, Intel Corporation.
  */
 /*
  * lustre/mdt/mdt_hsm.c
@@ -214,8 +214,7 @@ int mdt_hsm_state_get(struct tgt_session_info *tsi)
 
        lh = &info->mti_lh[MDT_LH_CHILD];
        mdt_lock_reg_init(lh, LCK_PR);
-       rc = mdt_object_lock(info, obj, lh, MDS_INODELOCK_LOOKUP,
-                            MDT_LOCAL_LOCK);
+       rc = mdt_object_lock(info, obj, lh, MDS_INODELOCK_LOOKUP);
        if (rc < 0)
                GOTO(out_ucred, rc);
 
@@ -248,7 +247,7 @@ out:
  *
  * Archive number is changed iif the value is not 0.
  * The new flagset that will be computed should result in a coherent state.
- * This function checks that are flags are compatible.
+ * This function checks that flags are compatible.
  *
  * This is MDS_HSM_STATE_SET RPC handler.
  */
@@ -276,7 +275,7 @@ int mdt_hsm_state_set(struct tgt_session_info *tsi)
        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, MDT_LOCAL_LOCK);
+                            MDS_INODELOCK_XATTR);
        if (rc < 0)
                GOTO(out_ucred, rc);