LU-2682 fid: cleanup direct _id and _seq access

[fs/lustre-release.git] / lustre / liblustre / tests / sanity.c

diff --git a/lustre/liblustre/tests/sanity.c b/lustre/liblustre/tests/sanity.c
index 78e19d5..141ebdf 100644 (file)
--- a/lustre/liblustre/tests/sanity.c
+++ b/lustre/liblustre/tests/sanity.c
@@ -1255,12 +1255,14 @@ int t55(char *name)
         close(fd);
 
         if (opt_verbose) {
-                printf("lmm_magic:          0x%08X\n",  lum->lmm_magic);
-                printf("lmm_object_id:      "LPX64"\n", lum->lmm_object_id);
-                printf("lmm_object_seq:     "LPX64"\n", lum->lmm_object_seq);
-                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);
+               printf("lmm_magic:          0x%08X\n",  lum->lmm_magic);
+               printf("lmm_object_id:      "LPX64"\n",
+                                               ostid_id(&lum->lmm_oi));
+               printf("lmm_object_seq:     "LPX64"\n",
+                                               ostid_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;
@@ -1320,13 +1322,15 @@ int t55(char *name)
         }
         close(fd);
 
-        if (opt_verbose) {
-                printf("lmm_magic:          0x%08X\n",  lum->lmm_magic);
-                printf("lmm_object_id:      "LPX64"\n", lum->lmm_object_id);
-                printf("lmm_object_seq:     "LPX64"\n", lum->lmm_object_seq);
-                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);
+       if (opt_verbose) {
+               printf("lmm_magic:          0x%08X\n",  lum->lmm_magic);
+               printf("lmm_object_id:      "LPX64"\n",
+                                               ostid_id(&lum->lmm_oi));
+               printf("lmm_object_seq:     "LPX64"\n",
+                                               ostid_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;