Skip to contentSkip to conversation

Recent changes (master)

PATCH Jens Axboe 1 participant 1 message Jun 1, 2024

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

The following changes since commit d5fbe84b83999d862838f36ea0d4a499e31f0653:

Merge branch 'enable-dataplacement-while-replaying-io' of https://github.com/parkvibes/fio (2024-05-28 14:19:19 -0400)

are available in the Git repository at:

git://git.kernel.dk/fio.git master

for you to fetch changes up to 93dc85482a998440f8e40814014da8cbfe9cf5e8:

Merge branch 'fix-coverity-scan-defect' of https://github.com/parkvibes/fio (2024-05-31 09:46:59 -0400)

----------------------------------------------------------------
Hyunwoo Park (2):
iolog: fix Null pointer dereferences (FORWARD_NULL)
iolog: fix Error handling issues (NEGATIVE_RETURNS)

Vincent Fu (1):
Merge branch 'fix-coverity-scan-defect' of https://github.com/parkvibes/fio

 iolog.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

---

Diff of recent changes:

iolog.c +4 -4
index 37ad0d2a..b57f845e 100644
@@ -145,7 +145,7 @@ static int ipo_special(struct thread_data *td, struct io_piece *ipo)
 				int dp_init_ret = dp_init(td);
 
 				if (dp_init_ret != 0) {
-					td_verror(td, dp_init_ret, "dp_init");
+					td_verror(td, abs(dp_init_ret), "dp_init");
 					return -1;
 				}
 			}
@@ -236,15 +236,15 @@ int read_iolog_get(struct thread_data *td, struct io_u *io_u)
 						io_u->buflen, io_u->file->file_name);
 			if (ipo->delay)
 				iolog_delay(td, ipo->delay);
+
+			if (td->o.dp_type != FIO_DP_NONE)
+				dp_fill_dspec_data(td, io_u);
 		} else {
 			elapsed = mtime_since_genesis();
 			if (ipo->delay > elapsed)
 				usec_sleep(td, (ipo->delay - elapsed) * 1000);
 		}
 
-		if (td->o.dp_type != FIO_DP_NONE)
-			dp_fill_dspec_data(td, io_u);
-
 		free(ipo);
 
 		if (io_u->ddir != DDIR_WAIT)