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

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

d4ac64cc1e8bb64b71a1f8ae882ee171d02fe792
diff --cc fio.h
index 4f2dc8f6,572670ec..67f0badf
--- a/fio.h
+++ b/fio.h
@@@ -1004,12 -1006,13 +1006,16 @@@ static inline void dprint_io_u(struct i
  
  	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...)
+ #define dprint_io_u(io_u, p)
+ #endif
  
  #endif