From 1ca5b4feaa88e35043e8e8aba25f7501faaa9ee9 Mon Sep 17 00:00:00 2001 From: "Adam H. Leventhal" Date: Wed, 14 Jan 2026 14:29:53 -0800 Subject: [PATCH 1/2] small typo that I couldn't ignore --- lib/propolis/src/hw/nvme/mod.rs | 5 ++++- lib/propolis/src/hw/nvme/queue.rs | 2 +- lib/propolis/src/hw/nvme/requests.rs | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/propolis/src/hw/nvme/mod.rs b/lib/propolis/src/hw/nvme/mod.rs index 6b1956488..c7f9e5c36 100644 --- a/lib/propolis/src/hw/nvme/mod.rs +++ b/lib/propolis/src/hw/nvme/mod.rs @@ -546,7 +546,10 @@ impl NvmeCtrl { 0 => u64::MAX, mdts => (self.ctrl.cap.mpsmin_sz() as u64) << mdts, }; - queue::TransferParams { lba_data_size, max_data_tranfser_size } + queue::TransferParams { + lba_data_size, + max_data_transfer_size: max_data_tranfser_size, + } } fn update_block_info(&mut self, info: block::DeviceInfo) { diff --git a/lib/propolis/src/hw/nvme/queue.rs b/lib/propolis/src/hw/nvme/queue.rs index d24a6dbad..a9b61da16 100644 --- a/lib/propolis/src/hw/nvme/queue.rs +++ b/lib/propolis/src/hw/nvme/queue.rs @@ -1116,7 +1116,7 @@ pub fn sqid_to_block_qid(sqid: super::QueueId) -> block::QueueId { #[derive(Copy, Clone, Debug, Default)] pub struct TransferParams { pub lba_data_size: u64, - pub max_data_tranfser_size: u64, + pub max_data_transfer_size: u64, } /// Configuration for Doorbell Buffer feature diff --git a/lib/propolis/src/hw/nvme/requests.rs b/lib/propolis/src/hw/nvme/requests.rs index 5f16c5b8e..8c8a183fb 100644 --- a/lib/propolis/src/hw/nvme/requests.rs +++ b/lib/propolis/src/hw/nvme/requests.rs @@ -96,7 +96,7 @@ impl block::DeviceQueue for NvmeBlockQueue { let off = params.lba_data_size * cmd.slba; let size = params.lba_data_size * (cmd.nlb as u64); - if size > params.max_data_tranfser_size { + if size > params.max_data_transfer_size { permit.complete( Completion::generic_err(bits::STS_INVAL_FIELD) .dnr(), @@ -121,7 +121,7 @@ impl block::DeviceQueue for NvmeBlockQueue { let off = params.lba_data_size * cmd.slba; let size = params.lba_data_size * (cmd.nlb as u64); - if size > params.max_data_tranfser_size { + if size > params.max_data_transfer_size { permit.complete( Completion::generic_err(bits::STS_INVAL_FIELD) .dnr(), From 36d550b6e9aa272f328b06ac1d1e97d62508e988 Mon Sep 17 00:00:00 2001 From: iximeow Date: Thu, 15 Jan 2026 00:21:56 +0000 Subject: [PATCH 2/2] more spelling --- lib/propolis/src/hw/nvme/mod.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/propolis/src/hw/nvme/mod.rs b/lib/propolis/src/hw/nvme/mod.rs index c7f9e5c36..78d0b1ffa 100644 --- a/lib/propolis/src/hw/nvme/mod.rs +++ b/lib/propolis/src/hw/nvme/mod.rs @@ -542,14 +542,11 @@ impl NvmeCtrl { fn transfer_params(&self) -> queue::TransferParams { let lba_data_size = 1u64 << (self.ns_ident.lbaf[(self.ns_ident.flbas & 0xF) as usize]).lbads; - let max_data_tranfser_size = match self.ctrl_ident.mdts { + let max_data_transfer_size = match self.ctrl_ident.mdts { 0 => u64::MAX, mdts => (self.ctrl.cap.mpsmin_sz() as u64) << mdts, }; - queue::TransferParams { - lba_data_size, - max_data_transfer_size: max_data_tranfser_size, - } + queue::TransferParams { lba_data_size, max_data_transfer_size } } fn update_block_info(&mut self, info: block::DeviceInfo) {