- adjusted fio patch for fio 3+ (with nanosecond precision); release 4

diff --git a/accelio-fio.patch b/accelio-fio.patch
index 1cae6f971005a170272f612137bdb75766273329..0a7b14dc3bd9b8ad857e8d3cf37c69fa0c239afd 100644 (file)
--- a/accelio-fio.patch
+++ b/accelio-fio.patch
@@ -29,6 +29,15 @@
        struct libraio_engine_data *engine_data = io_u->engine_data;
  
        fio_ro_check(td, io_u);
+@@ -170,7 +170,7 @@
+ static void fio_libraio_queued(struct thread_data *td, struct io_u **io_us,
+                              unsigned int nr)
+ {
+-      struct timeval now;
++      struct timespec now;
+       unsigned int i;
+ 
+       if (!fio_fill_issue_time(td))
 @@ -188,7 +188,7 @@
  
  static int fio_libraio_commit(struct thread_data *td)

diff --git a/accelio.spec b/accelio.spec
index c7e309791f0962b6abc96a7613c381946954001e..70f94ee39e2f3efec61d997ce6e87d4c022e06f2 100644 (file)
--- a/accelio.spec
+++ b/accelio.spec
@@ -10,7 +10,7 @@ Summary:      Open Source I/O, Message and RPC Acceleration library
 Summary(pl.UTF-8):     Mająca otwarte źródła biblioteka przyspieszająca we/wy, komunikaty i RPC
 Name:          accelio
 Version:       1.7
-Release:       3
+Release:       4
 License:       BSD
 Group:         Libraries
 #Source0Download: https://github.com/accelio/accelio/releases
@@ -21,13 +21,14 @@ Patch1:             %{name}-sse.patch
 URL:           http://www.accelio.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake >= 1:1.11
-%{?with_fio:BuildRequires:     fio-devel >= 2.19}
+%{?with_fio:BuildRequires:     fio-devel >= 3}
 BuildRequires: libaio-devel
 BuildRequires: libevent-devel >= 2
 BuildRequires: libibverbs-devel
 BuildRequires: libtool >= 2:2
 BuildRequires: numactl-devel
 BuildRequires: sed >= 4.0
+Conflicts:     fio < 3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description