From: Jens Axboe <axboe@fb.com>
Date: Sat, 3 Jan 2015 19:15:57 +0000 (-0700)
Subject: Get rid of lockfile callback
X-Git-Tag: fio-2.2.4~5
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=1a4a019ce7c18e604d1cb47798546708719a6fd0;p=fio.git

Get rid of lockfile callback

We don't need it, since the option priorities take care of
ordering.

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

diff --git a/options.c b/options.c
index 3e783c15..12ff621d 100644
--- 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 = {