Fix end-of-job slowdown for random IO with a random map

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 9d42deb02d47dbab2866fcb9d2512409e60aa1b5..0454cc4007936611ac53bad147b7f06b2afd2faa 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -78,7 +78,7 @@ static int extend_file(struct thread_data *td, struct fio_file *f)
                }
        }
 #endif
-       
+
        if (!new_layout)
                goto done;
 
@@ -233,7 +233,7 @@ static int file_size(struct thread_data *td, struct fio_file *f)
 
 static int bdev_size(struct thread_data *td, struct fio_file *f)
 {
-       unsigned long long bytes;
+       unsigned long long bytes = 0;
        int r;
 
        if (td->io_ops->open_file(td, f)) {
@@ -265,7 +265,7 @@ err:
 static int char_size(struct thread_data *td, struct fio_file *f)
 {
 #ifdef FIO_HAVE_CHARDEV_SIZE
-       unsigned long long bytes;
+       unsigned long long bytes = 0;
        int r;
 
        if (td->io_ops->open_file(td, f)) {
@@ -812,7 +812,7 @@ int init_random_map(struct thread_data *td)
                                (unsigned long long) td->o.rw_min_bs;
                num_maps = (blocks + BLOCKS_PER_MAP - 1) /
                                (unsigned long long) BLOCKS_PER_MAP;
-               f->file_map = smalloc(num_maps * sizeof(int));
+               f->file_map = smalloc(num_maps * sizeof(unsigned long));
                if (f->file_map) {
                        f->num_maps = num_maps;
                        continue;