More fio.h cleanups
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
diff --git a/file.h b/file.h
index 2b49a6b..7024d5e 100644
--- a/file.h
+++ b/file.h
@@ -140,4 +140,12 @@
extern int get_fileno(struct thread_data *, const char *);
extern void free_release_files(struct thread_data *);
+static inline void fio_file_reset(struct fio_file *f)
+{
+ f->last_free_lookup = 0;
+ f->last_pos = f->file_offset;
+ if (f->file_map)
+ memset(f->file_map, 0, f->num_maps * sizeof(int));
+}
+
#endif
diff --git a/filesetup.c b/filesetup.c
index 7ed47a2..c902bdf 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -13,6 +13,12 @@
static int root_warn;
+static inline void clear_error(struct thread_data *td)
+{
+ td->error = 0;
+ td->verror[0] = '\0';
+}
+
/*
* Leaves f->fd open on success, caller must close
*/
diff --git a/fio.h b/fio.h
index 9222c05..b2e40d2 100644
--- a/fio.h
+++ b/fio.h
@@ -553,39 +553,6 @@
} \
} while (0)
-static inline void fio_file_reset(struct fio_file *f)
-{
- f->last_free_lookup = 0;
- f->last_pos = f->file_offset;
- if (f->file_map)
- memset(f->file_map, 0, f->num_maps * sizeof(int));
-}
-
-static inline void clear_error(struct thread_data *td)
-{
- td->error = 0;
- td->verror[0] = '\0';
-}
-
-#ifdef FIO_INC_DEBUG
-static inline void dprint_io_u(struct io_u *io_u, const char *p)
-{
- struct fio_file *f = io_u->file;
-
- dprint(FD_IO, "%s: io_u %p: off=%llu/len=%lu/ddir=%d", p, io_u,
- (unsigned long long) io_u->offset,
- io_u->buflen, io_u->ddir);
- if (fio_debug & (1 << FD_IO)) {
- if (f)
- log_info("/%s", f->file_name);
-
- log_info("\n");
- }
-}
-#else
-#define dprint_io_u(io_u, p)
-#endif
-
static inline int fio_fill_issue_time(struct thread_data *td)
{
if (td->o.read_iolog_file ||
diff --git a/ioengine.h b/ioengine.h
index 2caece7..18496c3 100644
--- a/ioengine.h
+++ b/ioengine.h
@@ -149,4 +149,23 @@
void io_u_mark_complete(struct thread_data *, unsigned int);
void io_u_mark_submit(struct thread_data *, unsigned int);
+#ifdef FIO_INC_DEBUG
+static inline void dprint_io_u(struct io_u *io_u, const char *p)
+{
+ struct fio_file *f = io_u->file;
+
+ dprint(FD_IO, "%s: io_u %p: off=%llu/len=%lu/ddir=%d", p, io_u,
+ (unsigned long long) io_u->offset,
+ io_u->buflen, io_u->ddir);
+ if (fio_debug & (1 << FD_IO)) {
+ if (f)
+ log_info("/%s", f->file_name);
+
+ log_info("\n");
+ }
+}
+#else
+#define dprint_io_u(io_u, p)
+#endif
+
#endif