emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[thin_check (rust)] sm bitmap entries were being unpacked incorrectly.

Browse Source
This commit is contained in:
Joe Thornber 2020-08-10 12:55:05 +01:00
parent b915257e10
commit d5444d2255
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/pdata/space_map.rs
View File

@ -134,11 +134,14 @@ impl Unpack for Bitmap {
let val = word & 0x3; let val = word & 0x3;
word >>= 2; word >>= 2;
if val < 3 { // The bits are stored with the high bit at b * 2 + 1,
entries.push(BitmapEntry::Small(val as u8)); // and low at b *2. So we have to interpret this val.
} else { entries.push(match val {
entries.push(BitmapEntry::Overflow); 0 => BitmapEntry::Small(0),
} 1 => BitmapEntry::Small(2),
2 => BitmapEntry::Small(1),
_ => BitmapEntry::Overflow,
});
} }
i = tmp; i = tmp;
@ -173,7 +176,7 @@ where
impl<V> SpaceMap for CoreSpaceMap<V> impl<V> SpaceMap for CoreSpaceMap<V>
where where
V: Copy + Default + std::ops::AddAssign + From<u8> + Into<u32>, V: Copy + Default + std::ops::AddAssign + From<u8> + Into<u32>,
{ {
fn get(&self, b: u64) -> Result<u32> { fn get(&self, b: u64) -> Result<u32> {
Ok(self.counts[b as usize].into()) Ok(self.counts[b as usize].into())
} }