From 550e8532f8d928d79c1baa5e252586282a622563 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 21 May 2020 00:40:52 -0400 Subject: [PATCH] nvme_disk: Perform the new lba_count computation only once. As suggested by korli. No functional change. --- src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp b/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp index 3a347fbd05..b90ab7047b 100644 --- a/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp +++ b/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp @@ -753,16 +753,16 @@ nvme_disk_io(void* cookie, io_request* request) nvme_request.lba_count = 0; for (int i = 0; i < nvme_request.iovec_count; i++) { - int32 vec_lba_count = (nvme_request.iovecs[i].size / block_size); - if (nvme_request.lba_count > 0 - && (nvme_request.lba_count + vec_lba_count) > max_io_blocks) { + int32 new_lba_count = nvme_request.lba_count + + (nvme_request.iovecs[i].size / block_size); + if (nvme_request.lba_count > 0 && new_lba_count > max_io_blocks) { // We already have a nonzero length, and adding this vec would // make us go over (or we already are over.) Stop adding. nvme_request.iovec_count = i; break; } - nvme_request.lba_count += vec_lba_count; + nvme_request.lba_count = new_lba_count; } status = do_nvme_io_request(handle->info, &nvme_request);