Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/propolis/src/hw/nvme/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -542,11 +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_tranfser_size }
queue::TransferParams { lba_data_size, max_data_transfer_size }
}

fn update_block_info(&mut self, info: block::DeviceInfo) {
Expand Down
2 changes: 1 addition & 1 deletion lib/propolis/src/hw/nvme/queue.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions lib/propolis/src/hw/nvme/requests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand All @@ -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(),
Expand Down
Loading