Merge branch 'master' of ssh://git.kernel.dk/data/git/fio

diff --git a/filesetup.c b/filesetup.c
index 20ef3f8ffc97ce238e39ba4f2ef21e46a188bf7a..76b45a9c76af6762d73521355b031bdc38046c9c 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -600,14 +600,14 @@ int add_file(struct thread_data *td, const char *fname)
 
 void get_file(struct fio_file *f)
 {
-       dprint(FD_FILE, "get file %s/%d\n", f->file_name, f->references);
+       dprint(FD_FILE, "get file %s, ref=%d\n", f->file_name, f->references);
        assert(f->flags & FIO_FILE_OPEN);
        f->references++;
 }
 
 void put_file(struct thread_data *td, struct fio_file *f)
 {
-       dprint(FD_FILE, "get put %s/%d\n", f->file_name, f->references);
+       dprint(FD_FILE, "put file %s, ref=%d\n", f->file_name, f->references);
 
        if (!(f->flags & FIO_FILE_OPEN))
                return;

diff --git a/fio.h b/fio.h
index 572670ec0acb9792af4e808d69570ff8ea64c617..67f0badf8cb690d0b2940038157d19745b7075f0 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -1006,9 +1006,12 @@ static inline void dprint_io_u(struct io_u *io_u, const char *p)
 
        dprint(FD_IO, "%s: io_u %p: off=%llu/len=%lu/ddir=%d", p, io_u,
                                        io_u->offset, io_u->buflen, io_u->ddir);
-       if (f)
-               dprint(FD_IO, "/%s", f->file_name);
-       dprint(FD_IO, "\n");
+       if (fio_debug & (1 << FD_IO)) {
+               if (f)
+                       log_info("/%s", f->file_name);
+
+               log_info("\n");
+       }
 }
 #else
 #define dprint(type, str, args...)