From a01f1c4c80e4ef1c95f0d0fe47e31235dbdeed1a Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 28 Mar 2020 13:53:42 -0600 Subject: [PATCH] nvmed: fix block size conversion --- nvmed/src/scheme.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nvmed/src/scheme.rs b/nvmed/src/scheme.rs index 6a2da55dde..67d6f72161 100644 --- a/nvmed/src/scheme.rs +++ b/nvmed/src/scheme.rs @@ -89,7 +89,7 @@ impl DiskWrapper { let mut block_bytes = [0u8; 4096]; - partitionlib::get_partitions(&mut Device { disk, nvme, offset: 0, block_bytes: &mut block_bytes[..bs as usize] }, bs).ok().flatten() + partitionlib::get_partitions(&mut Device { disk, nvme, offset: 0, block_bytes: &mut block_bytes[..bs.into()] }, bs).ok().flatten() } fn new(mut inner: NvmeNamespace, nvme: &mut Nvme) -> Self { Self { @@ -320,7 +320,7 @@ impl SchemeBlockMut for DiskScheme { if rel_block + *offset as u64 / block_size >= part.size { return Err(Error::new(EOVERFLOW)); } - + let abs_block = part.start_lba + rel_block; if let Some(count) = unsafe { @@ -362,7 +362,7 @@ impl SchemeBlockMut for DiskScheme { if rel_block + *offset as u64 / block_size >= part.size { return Err(Error::new(EOVERFLOW)); } - + let abs_block = part.start_lba + rel_block; if let Some(count) = unsafe {