From: Jens Axboe <jens.axboe@oracle.com>
Date: Thu, 19 Apr 2007 14:31:16 +0000 (+0200)
Subject: Fix file unlinking
X-Git-Tag: fio-1.16~2
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=a9b7b3052b35c20e82b8fc909cd546a5fe1ff293

Fix file unlinking

We never set FIO_FILE_UNLINK. Just unlink if it's a regular
file and unlink=1 was given.

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

diff --git a/filesetup.c b/filesetup.c
index faeefaf3..d79fc610 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -474,8 +474,7 @@ void close_files(struct thread_data *td)
 	unsigned int i;
 
 	for_each_file(td, f, i) {
-		if ((f->flags & FIO_FILE_UNLINK) &&
-		    f->filetype == FIO_TYPE_FILE)
+		if (td->o.unlink && f->filetype == FIO_TYPE_FILE)
 			unlink(f->file_name);
 
 		td_io_close_file(td, f);
diff --git a/fio.h b/fio.h
index 92264d99..f9f2a577 100644
--- a/fio.h
+++ b/fio.h
@@ -238,13 +238,12 @@ enum fio_ioengine_flags {
 
 enum fio_file_flags {
 	FIO_FILE_OPEN		= 1 << 0,	/* file is open */
-	FIO_FILE_UNLINK		= 1 << 1,	/* unlink on close */
-	FIO_FILE_CLOSING	= 1 << 2,	/* file being closed */
-	FIO_FILE_EXISTS		= 1 << 3,	/* file there */
-	FIO_FILE_EXTEND		= 1 << 4,	/* needs extend */
-	FIO_FILE_NOSORT		= 1 << 5,	/* don't sort verify blocks */
-	FIO_FILE_DONE		= 1 << 6,	/* io completed to this file */
-	FIO_SIZE_KNOWN		= 1 << 7,	/* size has been set */
+	FIO_FILE_CLOSING	= 1 << 1,	/* file being closed */
+	FIO_FILE_EXISTS		= 1 << 2,	/* file there */
+	FIO_FILE_EXTEND		= 1 << 3,	/* needs extend */
+	FIO_FILE_NOSORT		= 1 << 4,	/* don't sort verify blocks */
+	FIO_FILE_DONE		= 1 << 5,	/* io completed to this file */
+	FIO_SIZE_KNOWN		= 1 << 6,	/* size has been set */
 };
 
 /*