From: Jens Axboe <axboe@carl.home.kernel.dk>
Date: Fri, 1 Feb 2008 20:51:29 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.kernel.dk/data/git/fio
X-Git-Tag: fio-1.18~12
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=d4ac64cc1e8bb64b71a1f8ae882ee171d02fe792;hp=79e48f72dea1639bcbee310c354938287b6d5790

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

diff --git a/filesetup.c b/filesetup.c
index 20ef3f8f..76b45a9c 100644
--- 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 572670ec..67f0badf 100644
--- 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...)