aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZang Ruochen <zangrc.fnst@cn.fujitsu.com>2019-09-24 14:00:30 +0800
committerKhem Raj <raj.khem@gmail.com>2019-09-24 10:35:46 -0700
commit2af2346bced741dc0befde4cb7700e4aeb55517e (patch)
tree52c1e4cc893b077b63388bbc68e343d6df0f4058
parent8c8a367431ce5cb8958c596d594918e7f801f12c (diff)
downloadmeta-openembedded-contrib-2af2346bced741dc0befde4cb7700e4aeb55517e.tar.gz
meta-openembedded-contrib-2af2346bced741dc0befde4cb7700e4aeb55517e.tar.bz2
meta-openembedded-contrib-2af2346bced741dc0befde4cb7700e4aeb55517e.zip
fio: upgrade 3.15 -> 3.16
-files/0001-engines-splice-remove-buggy-mem_align-set.patch Removed since this is included in 3.16. Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-benchmark/fio/files/0001-engines-splice-remove-buggy-mem_align-set.patch43
-rw-r--r--meta-oe/recipes-benchmark/fio/fio_3.16.bb (renamed from meta-oe/recipes-benchmark/fio/fio_3.15.bb)3
2 files changed, 1 insertions, 45 deletions
diff --git a/meta-oe/recipes-benchmark/fio/files/0001-engines-splice-remove-buggy-mem_align-set.patch b/meta-oe/recipes-benchmark/fio/files/0001-engines-splice-remove-buggy-mem_align-set.patch
deleted file mode 100644
index cb18032d24..0000000000
--- a/meta-oe/recipes-benchmark/fio/files/0001-engines-splice-remove-buggy-mem_align-set.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 8ca8a05d92fa799fe93a6edc27b058802211fddc Mon Sep 17 00:00:00 2001
-From: Jens Axboe <axboe@kernel.dk>
-Date: Sat, 3 Aug 2019 08:33:24 -0600
-Subject: [PATCH] engines/splice: remove buggy ->mem_align set
-
-Two things wrong here:
-
-1) We align buffers by default, so no need for splice to do anything
- extra.
-2) ->mem_align is not a true/false setting, it's the alignment itself.
- Hence the current setting to 1 is just buggy.
-
-Upstream-Status: Backport [https://github.com/axboe/fio/commit/8ca8a05d92fa799fe93a6edc27b058802211fddc]
-
-Fixes: https://github.com/axboe/fio/issues/810
-Reported-by: Sitsofe Wheeler <sitsofe@yahoo.com>
-Signed-off-by: Jens Axboe <axboe@kernel.dk>
-Signed-off-by: Liwei Song <liwei.song@windriver.com>
----
- engines/splice.c | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/engines/splice.c b/engines/splice.c
-index feb764feb2f4..6fc36bb6f154 100644
---- a/engines/splice.c
-+++ b/engines/splice.c
-@@ -278,13 +278,6 @@ static int fio_spliceio_init(struct thread_data *td)
- */
- sd->vmsplice_to_user_map = 1;
-
-- /*
-- * And if vmsplice_to_user works, we definitely need aligned
-- * buffers. Just set ->odirect to force that.
-- */
-- if (td_read(td))
-- td->o.mem_align = 1;
--
- td->io_ops_data = sd;
- return 0;
- }
---
-2.22.0
-
diff --git a/meta-oe/recipes-benchmark/fio/fio_3.15.bb b/meta-oe/recipes-benchmark/fio/fio_3.16.bb
index df81759dab..092b2bead0 100644
--- a/meta-oe/recipes-benchmark/fio/fio_3.15.bb
+++ b/meta-oe/recipes-benchmark/fio/fio_3.16.bb
@@ -21,10 +21,9 @@ PACKAGECONFIG_NUMA_armeb = ""
PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}"
PACKAGECONFIG[numa] = ",--disable-numa,numactl"
-SRCREV = "01bf5128d0581e267383f280c6a1dcd26517240f"
+SRCREV = "92f75708b530989fdb13b50be6604f44b80d038d"
SRC_URI = "git://git.kernel.dk/fio.git \
file://0001-update-the-interpreter-paths.patch \
- file://0001-engines-splice-remove-buggy-mem_align-set.patch \
"
S = "${WORKDIR}/git"