Unify max split zone support

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 1c36ff8fdecd66ec63fc35ea74ac9c1bf5e4fcb3..1d586b171e8bccad658b8a05945723d89c2ae5a6 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -59,8 +59,6 @@ static int native_fallocate(struct thread_data *td, struct fio_file *f)
 
 static void fallocate_file(struct thread_data *td, struct fio_file *f)
 {
-       int r;
-
        if (td->o.fill_device)
                return;
 
@@ -71,7 +69,9 @@ static void fallocate_file(struct thread_data *td, struct fio_file *f)
        case FIO_FALLOCATE_NONE:
                break;
 #ifdef CONFIG_POSIX_FALLOCATE
-       case FIO_FALLOCATE_POSIX:
+       case FIO_FALLOCATE_POSIX: {
+               int r;
+
                dprint(FD_FILE, "posix_fallocate file %s size %llu\n",
                                 f->file_name,
                                 (unsigned long long) f->real_file_size);
@@ -80,9 +80,12 @@ static void fallocate_file(struct thread_data *td, struct fio_file *f)
                if (r > 0)
                        log_err("fio: posix_fallocate fails: %s\n", strerror(r));
                break;
+               }
 #endif /* CONFIG_POSIX_FALLOCATE */
 #ifdef CONFIG_LINUX_FALLOCATE
-       case FIO_FALLOCATE_KEEP_SIZE:
+       case FIO_FALLOCATE_KEEP_SIZE: {
+               int r;
+
                dprint(FD_FILE, "fallocate(FALLOC_FL_KEEP_SIZE) "
                                "file %s size %llu\n", f->file_name,
                                (unsigned long long) f->real_file_size);
@@ -92,6 +95,7 @@ static void fallocate_file(struct thread_data *td, struct fio_file *f)
                        td_verror(td, errno, "fallocate");
 
                break;
+               }
 #endif /* CONFIG_LINUX_FALLOCATE */
        default:
                log_err("fio: unknown fallocate mode: %d\n", td->o.fallocate_mode);
@@ -431,8 +435,12 @@ static int get_file_size(struct thread_data *td, struct fio_file *f)
                ret = bdev_size(td, f);
        else if (f->filetype == FIO_TYPE_CHAR)
                ret = char_size(td, f);
-       else
-               f->real_file_size = -1ULL;
+       else {
+               f->real_file_size = -1;
+               log_info("%s: failed to get file size of %s\n", td->o.name,
+                                       f->file_name);
+               return 1; /* avoid offset extends end error message */
+       }
 
        /*
         * Leave ->real_file_size with 0 since it could be expectation
@@ -441,23 +449,11 @@ static int get_file_size(struct thread_data *td, struct fio_file *f)
        if (ret)
                return ret;
 
-       /*
-        * If ->real_file_size is -1, a conditional for the message
-        * "offset extends end" is always true, but it makes no sense,
-        * so just return the same value here.
-        */
-       if (f->real_file_size == -1ULL) {
-               log_info("%s: failed to get file size of %s\n", td->o.name,
-                                       f->file_name);
-               return 1;
-       }
-
-       if (td->o.start_offset && f->file_offset == 0)
-               dprint(FD_FILE, "offset of file %s not initialized yet\n",
-                                       f->file_name);
        /*
         * ->file_offset normally hasn't been initialized yet, so this
-        * is basically always false.
+        * is basically always false unless ->real_file_size is -1, but
+        * if ->real_file_size is -1 this message doesn't make sense.
+        * As a result, this message is basically useless.
         */
        if (f->file_offset > f->real_file_size) {
                log_err("%s: offset extends end (%llu > %llu)\n", td->o.name,
@@ -1737,10 +1733,10 @@ void unlock_file_all(struct thread_data *td, struct fio_file *f)
                unlock_file(td, f);
 }
 
-static int recurse_dir(struct thread_data *td, const char *dirname)
+static bool recurse_dir(struct thread_data *td, const char *dirname)
 {
        struct dirent *dir;
-       int ret = 0;
+       bool ret = false;
        DIR *D;
 
        D = opendir(dirname);
@@ -1749,7 +1745,7 @@ static int recurse_dir(struct thread_data *td, const char *dirname)
 
                snprintf(buf, FIO_VERROR_SIZE, "opendir(%s)", dirname);
                td_verror(td, errno, buf);
-               return 1;
+               return true;
        }
 
        while ((dir = readdir(D)) != NULL) {
@@ -1764,7 +1760,7 @@ static int recurse_dir(struct thread_data *td, const char *dirname)
                if (lstat(full_path, &sb) == -1) {
                        if (errno != ENOENT) {
                                td_verror(td, errno, "stat");
-                               ret = 1;
+                               ret = true;
                                break;
                        }
                }