X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fliblustre%2Ftests%2Fsanity.c;h=b5b595ccf95c7e96bb674c738ac072f327041292;hb=3b657b6b81913afe21e4140f374f0edab20a7f38;hp=141ebdf15f7ed3f1d5a4fdbf852e695c4ad3aa18;hpb=27f77f5de6fe27611c9f819f8cdaba89d70f15d9;p=fs%2Flustre-release.git

diff --git a/lustre/liblustre/tests/sanity.c b/lustre/liblustre/tests/sanity.c
index 141ebdf..b5b595c 100644
--- a/lustre/liblustre/tests/sanity.c
+++ b/lustre/liblustre/tests/sanity.c
@@ -26,6 +26,8 @@
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -1257,21 +1259,21 @@ int t55(char *name)
         if (opt_verbose) {
 		printf("lmm_magic:          0x%08X\n",  lum->lmm_magic);
 		printf("lmm_object_id:      "LPX64"\n",
-						ostid_id(&lum->lmm_oi));
+						lmm_oi_id(&lum->lmm_oi));
 		printf("lmm_object_seq:     "LPX64"\n",
-						ostid_seq(&lum->lmm_oi));
+						lmm_oi_seq(&lum->lmm_oi));
 		printf("lmm_stripe_count:   %u\n", (int)lum->lmm_stripe_count);
 		printf("lmm_stripe_size:    %u\n",      lum->lmm_stripe_size);
 		printf("lmm_stripe_pattern: %x\n",      lum->lmm_pattern);
 
-                for (index = 0; index < lum->lmm_stripe_count; index++) {
-                        lo = lum->lmm_objects + index;
-                        printf("object %d:\n", index);
-                        printf("\tobject_seq:   "LPX64"\n", lo->l_object_seq);
-                        printf("\tobject_id:    "LPX64"\n", lo->l_object_id);
-                        printf("\tost_gen:      %#x\n", lo->l_ost_gen);
-                        printf("\tost_idx:      %u\n", lo->l_ost_idx);
-                }
+		for (index = 0; index < lum->lmm_stripe_count; index++) {
+			lo = lum->lmm_objects + index;
+			printf("object %d:\n", index);
+			printf("\tobject_oid:   "DOSTID"\n",
+			       POSTID(&lo->l_ost_oi));
+			printf("\tost_gen:      %#x\n", lo->l_ost_gen);
+			printf("\tost_idx:      %u\n", lo->l_ost_idx);
+		}
         }
 
         if (lum->lmm_magic != LOV_USER_MAGIC ||
@@ -1325,21 +1327,21 @@ int t55(char *name)
 	if (opt_verbose) {
 		printf("lmm_magic:          0x%08X\n",  lum->lmm_magic);
 		printf("lmm_object_id:      "LPX64"\n",
-						ostid_id(&lum->lmm_oi));
+						lmm_oi_id(&lum->lmm_oi));
 		printf("lmm_object_seq:     "LPX64"\n",
-						ostid_seq(&lum->lmm_oi));
+						lmm_oi_seq(&lum->lmm_oi));
 		printf("lmm_stripe_count:   %u\n", (int)lum->lmm_stripe_count);
 		printf("lmm_stripe_size:    %u\n",      lum->lmm_stripe_size);
 		printf("lmm_stripe_pattern: %x\n",      lum->lmm_pattern);
 
-                for (index = 0; index < lum->lmm_stripe_count; index++) {
-                        lo = lum->lmm_objects + index;
-                        printf("object %d:\n", index);
-                        printf("\tobject_seq:   "LPX64"\n", lo->l_object_seq);
-                        printf("\tobject_id:    "LPX64"\n", lo->l_object_id);
-                        printf("\tost_gen:      %#x\n", lo->l_ost_gen);
-                        printf("\tost_idx:      %u\n", lo->l_ost_idx);
-                }
+		for (index = 0; index < lum->lmm_stripe_count; index++) {
+			lo = lum->lmm_objects + index;
+			printf("object %d:\n", index);
+			printf("\tobject_oid:   "DOSTID"\n",
+			       POSTID(&lo->l_ost_oi));
+			printf("\tost_gen:      %#x\n", lo->l_ost_gen);
+			printf("\tost_idx:      %u\n", lo->l_ost_idx);
+		}
         }
 
         if (lum->lmm_magic != LOV_USER_MAGIC ||