X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Ffalloc.c;h=6382569b9a92c42c1ad5d76a75d9441808de6cc8;hb=411a08212830ad9f7df297676f8f337efdb4bfc2;hp=bc5ebd716e7a072916cb47b5cabdae756328bf6a;hpb=e12d2800f811cb64d376cfdaed9a1257f3fa9c99;p=fio.git

diff --git a/engines/falloc.c b/engines/falloc.c
index bc5ebd71..6382569b 100644
--- a/engines/falloc.c
+++ b/engines/falloc.c
@@ -4,16 +4,12 @@
  * IO engine that does regular fallocate to simulate data transfer 
  * as fio ioengine.
  * DDIR_READ  does fallocate(,mode = FALLOC_FL_KEEP_SIZE,)
- * DDIR_WRITE does fallocate(,mode = 0) : fallocate with size extention 
+ * DDIR_WRITE does fallocate(,mode = 0) : fallocate with size extension
  * DDIR_TRIM  does fallocate(,mode = FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE)
  *
  */
 #include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/uio.h>
 #include <errno.h>
-#include <assert.h>
 #include <fcntl.h>
 
 #include "../fio.h"
@@ -23,7 +19,7 @@
  * generic_open_file is not appropriate because does not allow to perform
  * TRIM in to file
  */
-int open_file(struct thread_data *td, struct fio_file *f)
+static int open_file(struct thread_data *td, struct fio_file *f)
 {
 	int from_hash = 0;
 
@@ -43,9 +39,10 @@ open_again:
 
 	if (f->fd == -1) {
 		char buf[FIO_VERROR_SIZE];
-		int __e = errno;
-		snprintf(buf, sizeof(buf) - 1, "open(%s)", f->file_name);
-		td_verror(td, __e, buf);
+		int e = errno;
+
+		snprintf(buf, sizeof(buf), "open(%s)", f->file_name);
+		td_verror(td, e, buf);
 	}
 
 	if (!from_hash && f->fd != -1) {
@@ -68,8 +65,10 @@ open_again:
 #endif
 #ifndef FALLOC_FL_PUNCH_HOLE
 #define FALLOC_FL_PUNCH_HOLE    0x02 /* de-allocates range */
-#endif 
-static int fio_fallocate_queue(struct thread_data *td, struct io_u *io_u)
+#endif
+
+static enum fio_q_status fio_fallocate_queue(struct thread_data *td,
+					     struct io_u *io_u)
 {
 	struct fio_file *f = io_u->file;
 	int ret;
@@ -89,9 +88,6 @@ static int fio_fallocate_queue(struct thread_data *td, struct io_u *io_u)
 	if (ret)
 		io_u->error = errno;
 
-	if (io_u->file && ret == 0 && ddir_rw(io_u->ddir))
-		io_u->file->file_pos = io_u->offset + ret;
-
 	return FIO_Q_COMPLETED;
 }