X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=00f957651bc1ae65164c476665d73f863d1787ee;hp=37cf050894099ba5be67fccfc9b194c53201b56c;hb=5f350952eff89948bfbf1eb6ac4d3d08a9109581;hpb=f8977ee606bc51138a77f6a1b653df00faa77742

diff --git a/init.c b/init.c
index 37cf0508..00f95765 100644
--- a/init.c
+++ b/init.c
@@ -409,7 +409,7 @@ static struct option long_options[FIO_JOB_OPTS + FIO_CMD_OPTS] = {
 
 static int def_timeout = DEF_TIMEOUT;
 
-static char fio_version_string[] = "fio 1.7";
+static char fio_version_string[] = "fio 1.9";
 
 static char **ini_file;
 static int max_jobs = MAX_JOBS;
@@ -417,7 +417,6 @@ static int max_jobs = MAX_JOBS;
 struct thread_data def_thread;
 struct thread_data *threads = NULL;
 
-int rate_quit = 0;
 int exitall_on_terminate = 0;
 int terse_output = 0;
 unsigned long long mlock_size = 0;
@@ -517,7 +516,7 @@ static void fixup_options(struct thread_data *td)
 static char *to_kmg(unsigned int val)
 {
 	char *buf = malloc(32);
-	char post[] = { 0, 'K', 'G', 'P', -1 };
+	char post[] = { 0, 'K', 'M', 'G', 'P', -1 };
 	char *p = post;
 
 	while (*p != -1) {
@@ -539,8 +538,8 @@ static char *to_kmg(unsigned int val)
  */
 static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 {
-	char *ddir_str[] = { "read", "write", "randread", "randwrite",
-			     "rw", NULL, "randrw" };
+	const char *ddir_str[] = { "read", "write", "randread", "randwrite",
+				   "rw", NULL, "randrw" };
 	struct stat sb;
 	int numjobs, ddir, i;
 	struct fio_file *f;
@@ -850,6 +849,7 @@ static int str_ioengine_cb(void *data, const char *str)
 		return 0;
 
 	log_err("fio: ioengine: { linuxaio, aio, libaio }, posixaio, sync, mmap, sgio, splice, cpu\n");
+	log_err("fio: or specify path to dynamic ioengine module\n");
 	return 1;
 }