summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2011-01-26 20:52:52 +0100
committerJens Axboe <jaxboe@fusionio.com>2011-01-26 20:52:52 +0100
commit937222f5440430c5fed765f642f3c8f2e9969379 (patch)
treefa21faa4e66ea0ce9c56348c675b1af18c723799
parent08987f0e7f255968ed4780ba3a8ed0cb1bb63904 (diff)
parent3342a4c721f398faf43c5e358b414d2d454ba0d8 (diff)
downloadfio-937222f5440430c5fed765f642f3c8f2e9969379.tar.gz
fio-937222f5440430c5fed765f642f3c8f2e9969379.tar.bz2
Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
-rw-r--r--init.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/init.c b/init.c
index 6666f372..26f5ea7a 100644
--- a/init.c
+++ b/init.c
@@ -22,7 +22,7 @@
#include "lib/getopt.h"
-static char fio_version_string[] = "fio 1.50-rc4";
+static char fio_version_string[] = "fio 1.50";
#define FIO_RANDSEED (0xb1899bedUL)
@@ -1155,7 +1155,7 @@ static int parse_cmd_line(int argc, char *argv[])
read_only = 1;
break;
case 'v':
- /* already being printed, just quit */
+ log_info("%s\n", fio_version_string);
exit(0);
case 'e':
if (!strcmp("always", optarg))
@@ -1249,8 +1249,6 @@ int parse_options(int argc, char *argv[])
f_out = stdout;
f_err = stderr;
- log_info("%s\n", fio_version_string);
-
fio_options_fill_optstring();
fio_options_dup_and_init(l_opts);
@@ -1289,5 +1287,6 @@ int parse_options(int argc, char *argv[])
fio_gtod_cpu = def_thread.o.gtod_cpu;
}
+ log_info("%s\n", fio_version_string);
return 0;
}