diff options
Diffstat (limited to 'sys-block/fio/files')
| -rw-r--r-- | sys-block/fio/files/fio-3.16-snprintf.patch | 44 | ||||
| -rw-r--r-- | sys-block/fio/files/fio-3.16-verify_only_numberio.patch | 60 |
2 files changed, 0 insertions, 104 deletions
diff --git a/sys-block/fio/files/fio-3.16-snprintf.patch b/sys-block/fio/files/fio-3.16-snprintf.patch deleted file mode 100644 index 1470290f3cb4..000000000000 --- a/sys-block/fio/files/fio-3.16-snprintf.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 5b215853ed4b438b5b2d4ac3e56d5f0d19e145d9 Mon Sep 17 00:00:00 2001 -From: Anatol Pomozov <anatol.pomozov@gmail.com> -Date: Mon, 23 Sep 2019 14:12:12 -0700 -Subject: [PATCH] Fix compilation error with gfio -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit 36833fb04 replaced many usages of strncpy with snprintf. -But there is one place where new arguments were added but the function -name has not been changed. It leads to the following compilation error: - -gclient.c:333:2: error: too many arguments to function ‘strncpy’ - 333 | strncpy(message, sizeof(message), "%s", status_message); - | ^~~~~~~ -In file included from /usr/include/features.h:450, - from /usr/include/bits/libc-header-start.h:33, - from /usr/include/stdlib.h:25, - from gclient.c:1: -/usr/include/bits/string_fortified.h:103:1: note: declared here - 103 | __NTH (strncpy (char *__restrict __dest, const char *__restrict __src, - | ^~~~~ - -Signed-off-by: Anatol Pomozov <anatol.pomozov@gmail.com> ---- - gclient.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gclient.c b/gclient.c -index 64324177..d8dc62d2 100644 ---- a/gclient.c -+++ b/gclient.c -@@ -330,7 +330,7 @@ static void gfio_update_thread_status_all(struct gui *ui, char *status_message, - static char message[100]; - const char *m = message; - -- strncpy(message, sizeof(message), "%s", status_message); -+ snprintf(message, sizeof(message), "%s", status_message); - gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ui->thread_status_pb), m); - gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ui->thread_status_pb), perc / 100.0); - gtk_widget_queue_draw(ui->window); --- -2.24.0 - diff --git a/sys-block/fio/files/fio-3.16-verify_only_numberio.patch b/sys-block/fio/files/fio-3.16-verify_only_numberio.patch deleted file mode 100644 index 52fb389f62b2..000000000000 --- a/sys-block/fio/files/fio-3.16-verify_only_numberio.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 8859c0675aec03467ed65dfc79ecc874d026f165 Mon Sep 17 00:00:00 2001 -From: Gwendal Grignou <gwendal@chromium.org> -Date: Mon, 13 Jan 2020 16:35:10 -0800 -Subject: [PATCH] verify: Fix test to not check for numberio when verify_only - is true - -io->numberio can not be populated when verify_only is true, because -do_dry_run() build and complete IOs immediately, so it can not replicate -the numberio that was produced when the data was layered on the media. - -Without this fix, using write_random -[write_stress] -filename=${FILENAME} -size=${FILESIZE} -verify_only=${VERIFY_ONLY} -readwrite=randwrite -bs=4k -ioengine=libaio -iodepth=32 -direct=1 -do_verify=1 -verify=crc32c - -'VERIFY_ONLY=1 FILENAME=/dev/sda1 FILESIZE=1M fio write_random' passes, -but -'VERIFY_ONLY=0 FILENAME=/dev/sda1 FILESIZE=1M fio write_random' fails: -"""verify_only option fails with verify: bad header numberio 1, wanted -0""". -The fix addresses the problem by not checking numberio. - -Fixes #732 - -Signed-off-by: Gwendal Grignou <gwendal@chromium.org> ---- - verify.c | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/verify.c b/verify.c -index a2c0d41dbb8c..cf299ebf9643 100644 ---- a/verify.c -+++ b/verify.c -@@ -845,13 +845,11 @@ static int verify_header(struct io_u *io_u, struct thread_data *td, - * For read-only workloads, the program cannot be certain of the - * last numberio written to a block. Checking of numberio will be - * done only for workloads that write data. For verify_only, -- * numberio will be checked in the last iteration when the correct -- * state of numberio, that would have been written to each block -- * in a previous run of fio, has been reached. -+ * numberio check is skipped. - */ - if (td_write(td) && (td_min_bs(td) == td_max_bs(td)) && - !td->o.time_based) -- if (!td->o.verify_only || td->o.loops == 0) -+ if (!td->o.verify_only) - if (hdr->numberio != io_u->numberio) { - log_err("verify: bad header numberio %"PRIu16 - ", wanted %"PRIu16, --- -2.23.0 - |