srenblad/rust-fatfs
1
0
Fork 0
forked from M-Labs/rust-fatfs
Code Pull Requests Activity

Check if total clusters after formatting and fat type matches

Browse Source
This commit is contained in:
Rafał Harabień 2018-12-04 00:15:58 +01:00 committed by Rafał
parent b9753248f7
commit 253f816c40
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/fs.rs
View File

@ -1226,7 +1226,7 @@ fn format_bpb(options: &FormatOptions) -> io::Result<(BiosParameterBlock, FatTyp
let root_dir_sectors = (root_dir_bytes + bytes_per_sector as u32 - 1) / bytes_per_sector as u32; let root_dir_sectors = (root_dir_bytes + bytes_per_sector as u32 - 1) / bytes_per_sector as u32;
if total_sectors <= reserved_sectors as u32 + root_dir_sectors as u32 + 16 { if total_sectors <= reserved_sectors as u32 + root_dir_sectors as u32 + 16 {
return Err(Error::new(ErrorKind::Other, "volume is too small",)); return Err(Error::new(ErrorKind::Other, "Volume is too small",));
} }
//let fat_entries_per_sector = bytes_per_sector * 8 / fat_type.bits_per_fat_entry() as u16; //let fat_entries_per_sector = bytes_per_sector * 8 / fat_type.bits_per_fat_entry() as u16;
@ -1278,10 +1278,15 @@ fn format_bpb(options: &FormatOptions) -> io::Result<(BiosParameterBlock, FatTyp
drive_num, drive_num,
reserved_1: 0, reserved_1: 0,
ext_sig: 0x29, ext_sig: 0x29,
volume_id: options.volume_id.unwrap_or(0x12345678), // TODO: random? volume_id: options.volume_id.unwrap_or(0x12345678),
volume_label, volume_label,
fs_type_label, fs_type_label,
}; };
if FatType::from_clusters(bpb.total_clusters()) != fat_type {
return Err(Error::new(ErrorKind::Other, "Total number of clusters and FAT type does not match. Try other volume size"));
}
Ok((bpb, fat_type)) Ok((bpb, fat_type))
} }