X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_hsm.c;h=bbd3b48276ee9fcd6bb36978582825302de0523c;hb=refs%2Fchanges%2F09%2F28509%2F2;hp=ab0e851dea66f85d74222119f758f61bac368db7;hpb=62e93ef9a29341091c49d66a1535ea243ea950be;p=fs%2Flustre-release.git

diff --git a/lustre/mdt/mdt_hsm.c b/lustre/mdt/mdt_hsm.c
index ab0e851..bbd3b48 100644
--- 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. */
@@ -121,16 +122,16 @@ 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);
@@ -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);
 	}
@@ -496,7 +497,6 @@ int mdt_hsm_request(struct tgt_session_info *tsi)
 	int				 hui_list_size;
 	int				 data_size;
 	enum hsm_copytool_action	 action = HSMA_NONE;
-	__u64				 compound_id;
 	int				 hal_size, i, rc;
 	ENTRY;
 
@@ -583,7 +583,7 @@ int mdt_hsm_request(struct tgt_session_info *tsi)
 		hal->hal_count++;
 	}
 
-	rc = mdt_hsm_add_actions(info, hal, &compound_id);
+	rc = mdt_hsm_add_actions(info, hal);
 
 	MDT_HSM_FREE(hal, hal_size);