fsstress: translate flags in fiemap_f

[xfstests-dev.git] / ltp / aio-stress.c

diff --git a/ltp/aio-stress.c b/ltp/aio-stress.c
index ab9e00634bf72225668ad2648518e438aff2cbbd..d08843a8a2f84f15f24a964bc9ae09adadf2ac31 100644 (file)
--- a/ltp/aio-stress.c
+++ b/ltp/aio-stress.c
@@ -1167,9 +1167,9 @@ restart:
 
     if (t->stage_mb_trans && t->num_files > 0) {
         double seconds = time_since_now(&stage_time);
-       fprintf(stderr, "thread %d %s totals (%.2f MB/s) %.2f MB in %.2fs\n", 
-               t - global_thread_info, this_stage, t->stage_mb_trans/seconds, 
-               t->stage_mb_trans, seconds);
+       fprintf(stderr, "thread %llu %s totals (%.2f MB/s) %.2f MB in %.2fs\n",
+               (unsigned long long)(t - global_thread_info), this_stage,
+               t->stage_mb_trans/seconds, t->stage_mb_trans, seconds);
     }
 
     if (num_threads > 1) {
@@ -1210,7 +1210,6 @@ typedef void * (*start_routine)(void *);
 int run_workers(struct thread_info *t, int num_threads)
 {
     int ret;
-    int thread_ret;
     int i;
 
     for(i = 0 ; i < num_threads ; i++) {
@@ -1221,7 +1220,7 @@ int run_workers(struct thread_info *t, int num_threads)
        }
     }
     for(i = 0 ; i < num_threads ; i++) {
-        ret = pthread_join(t[i].tid, (void *)&thread_ret);
+        ret = pthread_join(t[i].tid, NULL);
         if (ret) {
            perror("pthread_join");
            exit(1);
@@ -1414,9 +1413,9 @@ int main(int ac, char **av)
                num_threads);
     }
 
-    t = malloc(num_threads * sizeof(*t));
+    t = calloc(num_threads, sizeof(*t));
     if (!t) {
-        perror("malloc");
+        perror("calloc");
        exit(1);
     }
     global_thread_info = t;
@@ -1449,16 +1448,19 @@ int main(int ac, char **av)
 
     if (file_size < num_contexts * context_offset) {
         fprintf(stderr, "file size %Lu too small for %d contexts\n", 
-               file_size, num_contexts);
+               (unsigned long long)file_size, num_contexts);
        exit(1);
     }
 
-    fprintf(stderr, "file size %LuMB, record size %luKB, depth %d, ios per iteration %d\n", file_size / (1024 * 1024), rec_len / 1024, depth, io_iter);
+    fprintf(stderr, "file size %LuMB, record size %luKB, depth %d, ios per iteration %d\n",
+           (unsigned long long)file_size / (1024 * 1024),
+           rec_len / 1024, depth, io_iter);
     fprintf(stderr, "max io_submit %d, buffer alignment set to %luKB\n", 
             max_io_submit, (page_size_mask + 1)/1024);
     fprintf(stderr, "threads %d files %d contexts %d context offset %LuMB verification %s\n", 
             num_threads, num_files, num_contexts, 
-           context_offset / (1024 * 1024), verify ? "on" : "off");
+           (unsigned long long)context_offset / (1024 * 1024),
+           verify ? "on" : "off");
     /* open all the files and do any required setup for them */
     for (i = optind ; i < ac ; i++) {
        int thread_index;