From 0c9c3a9b053b47543e38dd7242b9bfdf30f851e6 Mon Sep 17 00:00:00 2001 From: Shin'ichiro Kawasaki Date: Tue, 30 Apr 2024 19:30:20 +0900 Subject: [PATCH] zbd: remove unnecessary verify_backlog check in zbd_file_reset() The commit c5c8b92be5a2 ("zbd: fix zone reset condition for verify") improved zbd_file_reset() to not reset zones when data to verify is left. To check the left verify data, it tried to do the same as check_get_verify() including the check for the modulo operation "td->io_hist_len % td->o.verify_backlog". This check is required in check_get_verify() to know when to do the verify backlog operation. However, this check is not required in zbd_file_reset() since zone reset is not related to the verify backlog timing. The unnecessary check for "td->io_hist_len % td->o.verify_backlog" allows to reset zones even when td->io_hist_len is non-zero and the data to verify is left. It erases the data to verify and causes verify errors. Fix this by removing the unnecessary check. Fixes: c5c8b92be5a2 ("zbd: fix zone reset condition for verify") Signed-off-by: Shin'ichiro Kawasaki Link: https://lore.kernel.org/r/20240430103022.4136039-2-shinichiro.kawasaki@wdc.com Signed-off-by: Vincent Fu --- zbd.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/zbd.c b/zbd.c index 37417660..8a092cbe 100644 --- a/zbd.c +++ b/zbd.c @@ -1361,9 +1361,6 @@ void zbd_file_reset(struct thread_data *td, struct fio_file *f) if (td->o.verify != VERIFY_NONE) { verify_data_left = td->runstate == TD_VERIFYING || td->io_hist_len || td->verify_batch; - if (td->io_hist_len && td->o.verify_backlog) - verify_data_left = - td->io_hist_len % td->o.verify_backlog; if (!verify_data_left) zbd_reset_zones(td, f, zb, ze); } -- 2.25.1