| commit | 836fcc0fceb233ebcc41ee63b4ea5cae20b678a4 | [log] [tgz] |
|---|---|---|
| author | Jens Axboe <axboe@kernel.dk> | Thu Jan 24 09:08:45 2013 -0700 |
| committer | Jens Axboe <axboe@kernel.dk> | Thu Jan 24 09:08:45 2013 -0700 |
| tree | ba33bc3088166274d603105a9e957fda8fa7c013 | |
| parent | 4aaefbfa2b7a7a70ff6c6851dc3cee01b5993149 [diff] [blame] | |
| parent | 798827c895a585f284842f6b99378be19c821263 [diff] [blame] |
Merge branch 'master' into gfio Conflicts: Makefile backend.c client.c fio.c fio.h ioengine.h options.c os/os-linux.h server.c Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/iolog.h b/iolog.h index 4ad4e79..af84e10 100644 --- a/iolog.h +++ b/iolog.h
@@ -3,6 +3,7 @@ #include "lib/rbtree.h" #include "lib/ieee754.h" +#include "flist.h" #include "ioengine.h" /*