Move more file stuff to file.h

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/file.h b/file.h
index f07216b9eced067ad0cc014716d032ac5211da53..89120072a18a217c7f15b820d0246e8aa1b94812 100644 (file)
--- a/file.h
+++ b/file.h
@@ -106,4 +106,28 @@ FILE_FLAG_FNS(size_known);
 FILE_FLAG_FNS(hashed);
 #undef FILE_FLAG_FNS
 
+/*
+ * File setup/shutdown
+ */
+struct thread_data;
+extern void close_files(struct thread_data *);
+extern void close_and_free_files(struct thread_data *);
+extern int __must_check setup_files(struct thread_data *);
+extern int __must_check file_invalidate_cache(struct thread_data *, struct fio_file *);
+extern int __must_check generic_open_file(struct thread_data *, struct fio_file *);
+extern int __must_check generic_close_file(struct thread_data *, struct fio_file *);
+extern int __must_check generic_get_file_size(struct thread_data *, struct fio_file *);
+extern int __must_check pre_read_files(struct thread_data *);
+extern int add_file(struct thread_data *, const char *);
+extern void get_file(struct fio_file *);
+extern int __must_check put_file(struct thread_data *, struct fio_file *);
+extern void lock_file(struct thread_data *, struct fio_file *, enum fio_ddir);
+extern void unlock_file(struct thread_data *, struct fio_file *);
+extern void unlock_file_all(struct thread_data *, struct fio_file *);
+extern int add_dir_files(struct thread_data *, const char *);
+extern int init_random_map(struct thread_data *);
+extern void dup_files(struct thread_data *, struct thread_data *);
+extern int get_fileno(struct thread_data *, const char *);
+extern void free_release_files(struct thread_data *);
+
 #endif

diff --git a/fio.h b/fio.h
index d3a03795c9ecec7e1764f9b33408ac4f88e8fa42..19f7713b6558afb29e7a04097bc6aaa7adb7df2f 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -738,29 +738,6 @@ extern void td_fill_rand_seeds(struct thread_data *);
 #define FIO_GETOPT_JOB         0x89988998
 #define FIO_NR_OPTIONS         128
 
-/*
- * File setup/shutdown
- */
-extern void close_files(struct thread_data *);
-extern void close_and_free_files(struct thread_data *);
-extern int __must_check setup_files(struct thread_data *);
-extern int __must_check file_invalidate_cache(struct thread_data *, struct fio_file *);
-extern int __must_check generic_open_file(struct thread_data *, struct fio_file *);
-extern int __must_check generic_close_file(struct thread_data *, struct fio_file *);
-extern int __must_check generic_get_file_size(struct thread_data *, struct fio_file *);
-extern int __must_check pre_read_files(struct thread_data *);
-extern int add_file(struct thread_data *, const char *);
-extern void get_file(struct fio_file *);
-extern int __must_check put_file(struct thread_data *, struct fio_file *);
-extern void lock_file(struct thread_data *, struct fio_file *, enum fio_ddir);
-extern void unlock_file(struct thread_data *, struct fio_file *);
-extern void unlock_file_all(struct thread_data *, struct fio_file *);
-extern int add_dir_files(struct thread_data *, const char *);
-extern int init_random_map(struct thread_data *);
-extern void dup_files(struct thread_data *, struct thread_data *);
-extern int get_fileno(struct thread_data *, const char *);
-extern void free_release_files(struct thread_data *);
-
 /*
  * ETA/status stuff
  */