Merge branch 'master' of ssh://router/data/git/fio

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index 5432e383d439319eb918b3dd4162c2df774b0337..28be099ab71d432174e1fd1560afd1bf4e596c00 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -277,7 +277,7 @@ static int get_rw_ddir(struct thread_data *td)
                 * Check if it's time to seed a new data direction.
                 */
                if (elapsed >= td->rwmixcycle) {
                 * Check if it's time to seed a new data direction.
                 */
                if (elapsed >= td->rwmixcycle) {

-                       int v;
+                       unsigned int v;

                        long r;
 
                        r = os_random_long(&td->rwmix_state);
                        long r;
 
                        r = os_random_long(&td->rwmix_state);


@@ -422,7 +422,7 @@ static inline void td_set_runstate(struct thread_data *td, int runstate)
 
 static struct fio_file *get_next_file(struct thread_data *td)
 {
 
 static struct fio_file *get_next_file(struct thread_data *td)
 {

-       int old_next_file = td->next_file;
+       unsigned int old_next_file = td->next_file;

        struct fio_file *f;
 
        do {
        struct fio_file *f;
 
        do {