LU-10212 test: ESTALE read

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

diff --git a/lustre/mdt/mdt_hsm.c b/lustre/mdt/mdt_hsm.c
index acaa4a7..e870268 100644 (file)
--- a/lustre/mdt/mdt_hsm.c
+++ b/lustre/mdt/mdt_hsm.c
@@ -37,6 +37,7 @@
 
 #define DEBUG_SUBSYSTEM S_MDS
 
+#include <lustre_errno.h>
 #include "mdt_internal.h"
 
 /* Max allocation to satisfy single HSM RPC. */
@@ -58,10 +59,10 @@
 int mdt_hsm_attr_set(struct mdt_thread_info *info, struct mdt_object *obj,
                     const struct md_hsm *mh)
 {
-       struct md_object        *next = mdt_object_child(obj);
-       struct lu_buf           *buf = &info->mti_buf;
-       struct hsm_attrs        *attrs;
-       int                      rc;
+       struct md_object *next = mdt_object_child(obj);
+       struct lu_buf *buf = &info->mti_buf;
+       struct hsm_attrs *attrs;
+       int rc;
        ENTRY;
 
        attrs = (struct hsm_attrs *)info->mti_xattr_buf;
@@ -121,23 +122,23 @@ int mdt_hsm_progress(struct tgt_session_info *tsi)
 
        hpk->hpk_errval = lustre_errno_ntoh(hpk->hpk_errval);
 
-       CDEBUG(D_HSM, "Progress on "DFID": len="LPU64" err=%d\n",
+       CDEBUG(D_HSM, "Progress on "DFID": len=%llu : rc = %d\n",
               PFID(&hpk->hpk_fid), hpk->hpk_extent.length, hpk->hpk_errval);
 
        if (hpk->hpk_errval)
-               CDEBUG(D_HSM, "Copytool progress on "DFID" failed (%d); %s.\n",
+               CDEBUG(D_HSM, "Copytool progress on "DFID" failed : rc = %d; %s.\n",
                       PFID(&hpk->hpk_fid), hpk->hpk_errval,
                       hpk->hpk_flags & HP_FLAG_RETRY ? "will retry" : "fatal");
 
        if (hpk->hpk_flags & HP_FLAG_COMPLETED)
-               CDEBUG(D_HSM, "Finished "DFID" (%d) cancel cookie="LPX64"\n",
+               CDEBUG(D_HSM, "Finished "DFID" : rc = %d; cancel cookie=%#llx\n",
                       PFID(&hpk->hpk_fid), hpk->hpk_errval, hpk->hpk_cookie);
 
        info = tsi2mdt_info(tsi);
        if (!mdt_hsm_is_admin(info))
                GOTO(out, rc = -EPERM);
 
-       rc = mdt_hsm_coordinator_update(info, hpk);
+       rc = mdt_hsm_update_request_state(info, hpk);
 out:
        mdt_thread_info_fini(info);
        RETURN(rc);
@@ -281,8 +282,8 @@ int mdt_hsm_state_set(struct tgt_session_info *tsi)
 
        /* Detect out-of range masks */
        if ((hss->hss_setmask | hss->hss_clearmask) & ~HSM_FLAGS_MASK) {
-               CDEBUG(D_HSM, "Incompatible masks provided (set "LPX64
-                      ", clear "LPX64") vs supported set (%#x).\n",
+               CDEBUG(D_HSM, "Incompatible masks provided (set %#llx"
+                      ", clear %#llx) vs supported set (%#x).\n",
                       hss->hss_setmask, hss->hss_clearmask, HSM_FLAGS_MASK);
                GOTO(out_unlock, rc = -EINVAL);
        }
@@ -291,8 +292,8 @@ int mdt_hsm_state_set(struct tgt_session_info *tsi)
         * NOT defined in HSM_USER_MASK. */
        if (((hss->hss_setmask | hss->hss_clearmask) & ~HSM_USER_MASK) &&
            !md_capable(mdt_ucred(info), CFS_CAP_SYS_ADMIN)) {
-               CDEBUG(D_HSM, "Incompatible masks provided (set "LPX64
-                      ", clear "LPX64") vs unprivileged set (%#x).\n",
+               CDEBUG(D_HSM, "Incompatible masks provided (set %#llx"
+                      ", clear %#llx) vs unprivileged set (%#x).\n",
                       hss->hss_setmask, hss->hss_clearmask, HSM_USER_MASK);
                GOTO(out_unlock, rc = -EPERM);
        }
@@ -341,7 +342,7 @@ int mdt_hsm_state_set(struct tgt_session_info *tsi)
            (flags & HS_RELEASED && !(flags & HS_ARCHIVED)) ||
            (flags & HS_LOST     && !(flags & HS_ARCHIVED))) {
                CDEBUG(D_HSM, "Incompatible flag change on "DFID
-                             "flags="LPX64"\n",
+                             "flags=%#llx\n",
                       PFID(&info->mti_body->mbo_fid1), flags);
                GOTO(out_unlock, rc = -EINVAL);
        }
@@ -461,7 +462,7 @@ out:
 }
 
 /* Return true if a FID is present in an action list. */
-static bool is_fid_in_hal(struct hsm_action_list *hal, const lustre_fid *fid)
+static bool is_fid_in_hal(struct hsm_action_list *hal, const struct lu_fid *fid)
 {
        struct hsm_action_item *hai;
        int i;