LU-5734 lnet: improve clean up code and API

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

diff --git a/lustre/mdt/mdt_hsm.c b/lustre/mdt/mdt_hsm.c
index 75c2024..237663a 100644 (file)
--- a/lustre/mdt/mdt_hsm.c
+++ b/lustre/mdt/mdt_hsm.c
@@ -20,10 +20,11 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012, 2013, Intel Corporation.
- * Use is subject to license terms.
  * 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.
  */
 /*
  * lustre/mdt/mdt_hsm.c
@@ -225,7 +226,7 @@ int mdt_hsm_state_get(struct tgt_session_info *tsi)
                GOTO(out_unlock, rc);
 
        if (req_capsule_get_size(info->mti_pill, &RMF_CAPA1, RCL_CLIENT))
-               mdt_set_capainfo(info, 0, &info->mti_body->fid1,
+               mdt_set_capainfo(info, 0, &info->mti_body->mbo_fid1,
                                 req_capsule_client_get(info->mti_pill,
                                 &RMF_CAPA1));
 
@@ -285,7 +286,7 @@ int mdt_hsm_state_set(struct tgt_session_info *tsi)
                GOTO(out_ucred, rc);
 
        if (req_capsule_get_size(info->mti_pill, &RMF_CAPA1, RCL_CLIENT))
-               mdt_set_capainfo(info, 0, &info->mti_body->fid1,
+               mdt_set_capainfo(info, 0, &info->mti_body->mbo_fid1,
                            req_capsule_client_get(info->mti_pill, &RMF_CAPA1));
 
        /* Non-root users are forbidden to set or clear flags which are
@@ -312,7 +313,7 @@ int mdt_hsm_state_set(struct tgt_session_info *tsi)
                if (!(ma->ma_hsm.mh_flags & HS_EXISTS)) {
                        CDEBUG(D_HSM, "Could not set an archive number for "
                               DFID "if HSM EXISTS flag is not set.\n",
-                              PFID(&info->mti_body->fid1));
+                              PFID(&info->mti_body->mbo_fid1));
                        GOTO(out_unlock, rc);
                }
                ma->ma_hsm.mh_arch_id = hss->hss_archive_id;
@@ -331,8 +332,8 @@ int mdt_hsm_state_set(struct tgt_session_info *tsi)
            (flags & HS_LOST     && !(flags & HS_ARCHIVED))) {
                CDEBUG(D_HSM, "Incompatible flag change on "DFID
                              "flags="LPX64"\n",
-                      PFID(&info->mti_body->fid1), flags);
-               GOTO(out_ucred, rc = -EINVAL);
+                      PFID(&info->mti_body->mbo_fid1), flags);
+               GOTO(out_unlock, rc = -EINVAL);
        }
 
        /* Save the modified flags */
@@ -382,7 +383,7 @@ int mdt_hsm_action(struct tgt_session_info *tsi)
                GOTO(out, rc = err_serious(rc));
 
        if (req_capsule_get_size(tsi->tsi_pill, &RMF_CAPA1, RCL_CLIENT))
-               mdt_set_capainfo(info, 0, &info->mti_body->fid1,
+               mdt_set_capainfo(info, 0, &info->mti_body->mbo_fid1,
                                 req_capsule_client_get(info->mti_pill,
                                                        &RMF_CAPA1));
 
@@ -405,7 +406,7 @@ int mdt_hsm_action(struct tgt_session_info *tsi)
        hai->hai_action = HSMA_NONE;
        hai->hai_cookie = 0;
        hai->hai_gid = 0;
-       hai->hai_fid = info->mti_body->fid1;
+       hai->hai_fid = info->mti_body->mbo_fid1;
        hai->hai_len = sizeof(*hai);
 
        rc = mdt_hsm_get_actions(info, hal);