The following changes since commit aa60bc582119e8fcd4588dc5820c1cbcab599984: time: convert to uint64_t (2013-01-04 13:24:52 +0100) are available in the git repository at: git://git.kernel.dk/fio.git master Jens Axboe (4): Enable -ffast-math Use variable[] instead of GCC variable[0] syntax server: move fio_net_cmd to the end of fio_net_int_cmd Fix potential null pointer dereference on verify and requeue events Makefile | 2 +- backend.c | 5 ++++- server.h | 8 ++++---- stat.h | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) --- Diff of recent changes: diff --git a/Makefile b/Makefile index 7433504..ba8b997 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ CC ?= gcc DEBUGFLAGS = -D_FORTIFY_SOURCE=2 -DFIO_INC_DEBUG CPPFLAGS= -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \ $(DEBUGFLAGS) -OPTFLAGS= -O3 -g $(EXTFLAGS) +OPTFLAGS= -O3 -g -ffast-math $(EXTFLAGS) CFLAGS = -std=gnu99 -Wwrite-strings -Wall $(OPTFLAGS) LIBS = -lm $(EXTLIBS) PROGS = fio diff --git a/backend.c b/backend.c index 225d8a3..099bd9b 100644 --- a/backend.c +++ b/backend.c @@ -422,6 +422,7 @@ static void do_verify(struct thread_data *td) io_u = NULL; while (!td->terminate) { + enum fio_ddir ddir; int ret2, full; update_tv_cache(td); @@ -456,6 +457,8 @@ static void do_verify(struct thread_data *td) else io_u->end_io = verify_io_u; + ddir = io_u->ddir; + ret = td_io_queue(td, io_u); switch (ret) { case FIO_Q_COMPLETED: @@ -507,7 +510,7 @@ sync_done: break; } - if (break_on_this_error(td, io_u->ddir, &ret)) + if (break_on_this_error(td, ddir, &ret)) break; /* diff --git a/server.h b/server.h index 624e4c0..3f1bde4 100644 --- a/server.h +++ b/server.h @@ -25,14 +25,14 @@ struct fio_net_cmd { */ uint16_t cmd_crc16; /* cmd checksum */ uint16_t pdu_crc16; /* payload checksum */ - uint8_t payload[0]; /* payload */ + uint8_t payload[]; /* payload */ }; struct fio_net_int_cmd { - struct fio_net_cmd cmd; struct flist_head list; struct timeval tv; uint64_t saved_tag; + struct fio_net_cmd cmd; }; enum { @@ -86,12 +86,12 @@ struct cmd_probe_pdu { struct cmd_single_line_pdu { uint16_t len; - uint8_t text[0]; + uint8_t text[]; }; struct cmd_line_pdu { uint16_t lines; - struct cmd_single_line_pdu options[0]; + struct cmd_single_line_pdu options[]; }; struct cmd_start_pdu { diff --git a/stat.h b/stat.h index b9e0448..4ca8261 100644 --- a/stat.h +++ b/stat.h @@ -186,7 +186,7 @@ struct jobs_eta { * Network 'copy' of run_str[] */ uint32_t nr_threads; - uint8_t run_str[0]; + uint8_t run_str[]; }; extern void show_thread_status(struct thread_stat *ts, struct group_run_stats *rs); -- To unsubscribe from this list: send the line "unsubscribe fio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html