X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Futils%2Fll_decode_filter_fid.c;h=8eb7b666abc7f45e4e586e7359feb62965c0654b;hb=4dfa29e8e0e77add076ef992bb9061519669dc16;hp=04dadf7ce51f52e55174c28e6908c475681eeae9;hpb=fd3dcf04aa169560986a15880d0ced9b07adaad4;p=fs%2Flustre-release.git

diff --git a/lustre/utils/ll_decode_filter_fid.c b/lustre/utils/ll_decode_filter_fid.c
index 04dadf7..8eb7b66 100644
--- a/lustre/utils/ll_decode_filter_fid.c
+++ b/lustre/utils/ll_decode_filter_fid.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -46,7 +46,7 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/xattr.h>
-#include <liblustre.h>
+#include <asm/byteorder.h>
 #include <lustre/lustre_user.h>
 
 int main(int argc, char *argv[])
@@ -75,20 +75,20 @@ int main(int argc, char *argv[])
 			struct filter_fid_old *ffo = (void *)buf;
 
 			/* old filter_fid */
-			printf("%s: objid="LPU64" seq="LPU64" parent="DFID
+			printf("%s: objid=%llu seq=%llu parent="DFID
 			       " stripe=%u\n", argv[i],
-			       le64_to_cpu(ffo->ff_objid),
-			       le64_to_cpu(ffo->ff_seq),
-			       le64_to_cpu(ffo->ff_parent.f_seq),
-			       le32_to_cpu(ffo->ff_parent.f_oid), 0 /* ver */,
+			       (unsigned long long)__le64_to_cpu(ffo->ff_objid),
+			       (unsigned long long)__le64_to_cpu(ffo->ff_seq),
+			       (unsigned long long)__le64_to_cpu(ffo->ff_parent.f_seq),
+			       le32toh(ffo->ff_parent.f_oid), 0 /* ver */,
 			       /* this is stripe_nr actually */
-			       le32_to_cpu(ffo->ff_parent.f_ver));
+			       le32toh(ffo->ff_parent.f_stripe_idx));
 		} else {
 			printf("%s: parent="DFID" stripe=%u\n", argv[i],
-			       le64_to_cpu(ff->ff_parent.f_seq),
-			       le32_to_cpu(ff->ff_parent.f_oid), 0, /* ver */
+			       (unsigned long long)__le64_to_cpu(ff->ff_parent.f_seq),
+			       __le32_to_cpu(ff->ff_parent.f_oid), 0, /* ver */
 			       /* this is stripe_nr actually */
-			       le32_to_cpu(ff->ff_parent.f_ver));
+			       __le32_to_cpu(ff->ff_parent.f_stripe_idx));
 		}
 	}