_scratch_mkfs_geom(): Filter out 'k' suffix from fs block size

[xfstests-dev.git] / dmapi / src / sample_hsm / mls.c

diff --git a/dmapi/src/sample_hsm/mls.c b/dmapi/src/sample_hsm/mls.c
index 838793b23a9096c71a0e7f96ab928228948da674..10d899588c9f4bd295638e72bc7c924dc4f2ca0f 100644 (file)
--- a/dmapi/src/sample_hsm/mls.c
+++ b/dmapi/src/sample_hsm/mls.c
@@ -183,13 +183,8 @@ mr_info(
        printf("\n");
        for (i=0; i<ret; i++) {
                printf("\tRegion %d:\n", i);
-#ifdef __sgi
-               printf("\t\toffset %lld, ", rgn[i].rg_offset);
-               printf("size %lld, ", rgn[i].rg_size);
-#else
-               printf("\t\toffset %ld, ", rgn[i].rg_offset);
-               printf("size %ld, ", rgn[i].rg_size);
-#endif
+               printf("\t\toffset %lld, ", (long long) rgn[i].rg_offset);
+               printf("size %llu, ", (unsigned long long) rgn[i].rg_size);
                printf("flags 0x%x", rgn[i].rg_flags);
                printf(" ( ");
                if (rgn[i].rg_flags & DM_REGION_NOEVENT)
@@ -214,7 +209,6 @@ event_info(
        void            *hanp,
        size_t           hlen)
 {
-       u_int           i;
        u_int           ret;
        dm_eventset_t   eventlist;
 
@@ -318,13 +312,8 @@ alloc_info(
                                printf("(resident): ");
                        if (ext[i].ex_type == DM_EXTENT_HOLE)
                                printf("(hole): ");
-#ifdef __sgi
-                       printf("offset %lld, ", ext[i].ex_offset);
-                       printf("len %lld\n", ext[i].ex_length);
-#else
-                       printf("offset %ld, ", ext[i].ex_offset);
-                       printf("len %ld\n", ext[i].ex_length);
-#endif
+                       printf("offset %lld, ", (long long) ext[i].ex_offset);
+                       printf("len %llu\n", (unsigned long long) ext[i].ex_length);
                }
        } while (more == 1);
        return(0);