X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fofd%2Fofd_lvb.c;h=b1d50eb35e7cdf642d4de3b7eff772e5165b09e1;hb=ed4e8ed4c172f6b442ac41b06fe63de38231ab87;hp=9da030055d5d82bdf3fa3cf1f6c498cc47bcface;hpb=2b44b8b015574645a3bea7219f2dba117e7a5bf6;p=fs%2Flustre-release.git

diff --git a/lustre/ofd/ofd_lvb.c b/lustre/ofd/ofd_lvb.c
index 9da0300..b1d50eb 100644
--- a/lustre/ofd/ofd_lvb.c
+++ b/lustre/ofd/ofd_lvb.c
@@ -23,7 +23,7 @@
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2014 Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -45,6 +45,7 @@
 
 #define DEBUG_SUBSYSTEM S_FILTER
 
+#include <lustre_swab.h>
 #include "ofd_internal.h"
 
 /**
@@ -132,8 +133,8 @@ static int ofd_lvbo_init(struct ldlm_resource *res)
 	lvb->lvb_atime = info->fti_attr.la_atime;
 	lvb->lvb_ctime = info->fti_attr.la_ctime;
 
-	CDEBUG(D_DLMTRACE, "res: "DFID" initial lvb size: "LPU64", "
-	       "mtime: "LPX64", blocks: "LPX64"\n",
+	CDEBUG(D_DLMTRACE, "res: "DFID" initial lvb size: %llu, "
+	       "mtime: %#llx, blocks: %#llx\n",
 	       PFID(&info->fti_fid), lvb->lvb_size,
 	       lvb->lvb_mtime, lvb->lvb_blocks);
 
@@ -243,31 +244,31 @@ static int ofd_lvbo_update(struct ldlm_resource *res,
 		lock_res(res);
 		if (rpc_lvb->lvb_size > lvb->lvb_size || !increase_only) {
 			CDEBUG(D_DLMTRACE, "res: "DFID" updating lvb size: "
-			       LPU64" -> "LPU64"\n", PFID(&info->fti_fid),
+			       "%llu -> %llu\n", PFID(&info->fti_fid),
 			       lvb->lvb_size, rpc_lvb->lvb_size);
 			lvb->lvb_size = rpc_lvb->lvb_size;
 		}
 		if (rpc_lvb->lvb_mtime > lvb->lvb_mtime || !increase_only) {
 			CDEBUG(D_DLMTRACE, "res: "DFID" updating lvb mtime: "
-			       LPU64" -> "LPU64"\n", PFID(&info->fti_fid),
+			       "%llu -> %llu\n", PFID(&info->fti_fid),
 			       lvb->lvb_mtime, rpc_lvb->lvb_mtime);
 			lvb->lvb_mtime = rpc_lvb->lvb_mtime;
 		}
 		if (rpc_lvb->lvb_atime > lvb->lvb_atime || !increase_only) {
 			CDEBUG(D_DLMTRACE, "res: "DFID" updating lvb atime: "
-			       LPU64" -> "LPU64"\n", PFID(&info->fti_fid),
+			       "%llu -> %llu\n", PFID(&info->fti_fid),
 			       lvb->lvb_atime, rpc_lvb->lvb_atime);
 			lvb->lvb_atime = rpc_lvb->lvb_atime;
 		}
 		if (rpc_lvb->lvb_ctime > lvb->lvb_ctime || !increase_only) {
 			CDEBUG(D_DLMTRACE, "res: "DFID" updating lvb ctime: "
-			       LPU64" -> "LPU64"\n", PFID(&info->fti_fid),
+			       "%llu -> %llu\n", PFID(&info->fti_fid),
 			       lvb->lvb_ctime, rpc_lvb->lvb_ctime);
 			lvb->lvb_ctime = rpc_lvb->lvb_ctime;
 		}
 		if (rpc_lvb->lvb_blocks > lvb->lvb_blocks || !increase_only) {
 			CDEBUG(D_DLMTRACE, "res: "DFID" updating lvb blocks: "
-			       LPU64" -> "LPU64"\n", PFID(&info->fti_fid),
+			       "%llu -> %llu\n", PFID(&info->fti_fid),
 			       lvb->lvb_blocks, rpc_lvb->lvb_blocks);
 			lvb->lvb_blocks = rpc_lvb->lvb_blocks;
 		}
@@ -289,32 +290,32 @@ disk_update:
 	lock_res(res);
 	if (info->fti_attr.la_size > lvb->lvb_size || !increase_only) {
 		CDEBUG(D_DLMTRACE, "res: "DFID" updating lvb size from disk: "
-		       LPU64" -> %llu\n", PFID(&info->fti_fid),
+		       "%llu -> %llu\n", PFID(&info->fti_fid),
 		       lvb->lvb_size, info->fti_attr.la_size);
 		lvb->lvb_size = info->fti_attr.la_size;
 	}
 
 	if (info->fti_attr.la_mtime >lvb->lvb_mtime || !increase_only) {
 		CDEBUG(D_DLMTRACE, "res: "DFID" updating lvb mtime from disk: "
-		       LPU64" -> "LPU64"\n", PFID(&info->fti_fid),
+		       "%llu -> %llu\n", PFID(&info->fti_fid),
 		       lvb->lvb_mtime, info->fti_attr.la_mtime);
 		lvb->lvb_mtime = info->fti_attr.la_mtime;
 	}
 	if (info->fti_attr.la_atime >lvb->lvb_atime || !increase_only) {
 		CDEBUG(D_DLMTRACE, "res: "DFID" updating lvb atime from disk: "
-		       LPU64" -> "LPU64"\n", PFID(&info->fti_fid),
+		       "%llu -> %llu\n", PFID(&info->fti_fid),
 		       lvb->lvb_atime, info->fti_attr.la_atime);
 		lvb->lvb_atime = info->fti_attr.la_atime;
 	}
 	if (info->fti_attr.la_ctime >lvb->lvb_ctime || !increase_only) {
 		CDEBUG(D_DLMTRACE, "res: "DFID" updating lvb ctime from disk: "
-		       LPU64" -> "LPU64"\n", PFID(&info->fti_fid),
+		       "%llu -> %llu\n", PFID(&info->fti_fid),
 		       lvb->lvb_ctime, info->fti_attr.la_ctime);
 		lvb->lvb_ctime = info->fti_attr.la_ctime;
 	}
 	if (info->fti_attr.la_blocks > lvb->lvb_blocks || !increase_only) {
 		CDEBUG(D_DLMTRACE, "res: "DFID" updating lvb blocks from disk: "
-		       LPU64" -> %llu\n", PFID(&info->fti_fid), lvb->lvb_blocks,
+		       "%llu -> %llu\n", PFID(&info->fti_fid), lvb->lvb_blocks,
 		       (unsigned long long)info->fti_attr.la_blocks);
 		lvb->lvb_blocks = info->fti_attr.la_blocks;
 	}