From: Jens Axboe <jens.axboe@oracle.com>
Date: Tue, 27 Mar 2007 13:56:10 +0000 (+0200)
Subject: No need to return an error from get_file_sizes()
X-Git-Tag: fio-1.15~16
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=000b080395e45cbe0ce54e75f0e993addbdc8676

No need to return an error from get_file_sizes()

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

diff --git a/filesetup.c b/filesetup.c
index 2da29d15..5ad626a9 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -263,25 +263,18 @@ int open_files(struct thread_data *td)
 /*
  * open/close all files, so that ->real_file_size gets set
  */
-static int get_file_sizes(struct thread_data *td)
+static void get_file_sizes(struct thread_data *td)
 {
 	struct fio_file *f;
 	unsigned int i;
-	int err = 0;
 
 	for_each_file(td, f, i) {
-		err = td->io_ops->open_file(td, f);
-		if (err) {
+		if (td->io_ops->open_file(td, f)) {
 			td->error = 0;
 			memset(td->verror, 0, sizeof(td->verror));
-			err = 0;
-			continue;
-		}
-
-		td->io_ops->close_file(td, f);
+		} else
+			td->io_ops->close_file(td, f);
 	}
-
-	return err;
 }
 
 /*
@@ -292,7 +285,7 @@ int setup_files(struct thread_data *td)
 	unsigned long long total_size, extend_size;
 	struct fio_file *f;
 	unsigned int i;
-	int err, need_extend;
+	int err = 0, need_extend;
 
 	/*
 	 * if ioengine defines a setup() method, it's responsible for
@@ -302,7 +295,7 @@ int setup_files(struct thread_data *td)
 	if (td->io_ops->setup)
 		err = td->io_ops->setup(td);
 	else
-		err = get_file_sizes(td);
+		get_file_sizes(td);
 
 	if (err)
 		return err;