Get rid of lockfile callback
authorJens Axboe <axboe@fb.com>
Sat, 3 Jan 2015 19:15:57 +0000 (12:15 -0700)
committerJens Axboe <axboe@fb.com>
Sat, 3 Jan 2015 19:15:57 +0000 (12:15 -0700)
We don't need it, since the option priorities take care of
ordering.

Signed-off-by: Jens Axboe <axboe@fb.com>
options.c

index 3e783c15edc7375e7b4af251347068ee1622286c..12ff621d0f1dfb4c7f96fe3bc2e478e2faa8a46d 100644 (file)
--- a/options.c
+++ b/options.c
@@ -884,18 +884,6 @@ out:
        return ret;
 }
 
-static int str_lockfile_cb(void *data, const char fio_unused *str)
-{
-       struct thread_data *td = data;
-
-       if (td->files_index) {
-               log_err("fio: lockfile= option must precede filename=\n");
-               return 1;
-       }
-
-       return 0;
-}
-
 static int str_opendir_cb(void *data, const char fio_unused *str)
 {
        struct thread_data *td = data;
@@ -1343,7 +1331,6 @@ struct fio_option fio_options[FIO_MAX_OPTS] = {
                .parent = "filename",
                .hide   = 0,
                .def    = "none",
-               .cb     = str_lockfile_cb,
                .category = FIO_OPT_C_FILE,
                .group  = FIO_OPT_G_FILENAME,
                .posval = {