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

Do not ignore 2 last clusters when allocating

Browse Source
This commit is contained in:
Rafał Harabień 2018-05-26 17:02:36 +02:00
parent 9129816893
commit 6230fe91f9
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/table.rs
View File

@ -13,6 +13,8 @@ type Fat12 = Fat<u8>;
type Fat16 = Fat<u16>; type Fat16 = Fat<u16>;
type Fat32 = Fat<u32>; type Fat32 = Fat<u32>;
const RESERVED_FAT_ENTRIES: u32 = 2;
#[derive(Debug, Clone, Copy)] #[derive(Debug, Clone, Copy)]
enum FatValue { enum FatValue {
Free, Free,
@ -62,11 +64,12 @@ fn find_free_cluster(fat: &mut ReadSeek, fat_type: FatType, start_cluster: u32,
} }
pub(crate) fn alloc_cluster(fat: &mut DiskSlice, fat_type: FatType, prev_cluster: Option<u32>, hint: Option<u32>, total_clusters: u32) -> io::Result<u32> { pub(crate) fn alloc_cluster(fat: &mut DiskSlice, fat_type: FatType, prev_cluster: Option<u32>, hint: Option<u32>, total_clusters: u32) -> io::Result<u32> {
let end_cluster = total_clusters + RESERVED_FAT_ENTRIES;
let start_cluster = match hint { let start_cluster = match hint {
Some(n) if n < total_clusters => n, Some(n) if n < end_cluster => n,
_ => 2, _ => 2,
}; };
let new_cluster = match find_free_cluster(fat, fat_type, start_cluster, total_clusters) { let new_cluster = match find_free_cluster(fat, fat_type, start_cluster, end_cluster) {
Ok(n) => n, Ok(n) => n,
Err(_) if start_cluster > 2 => find_free_cluster(fat, fat_type, 2, start_cluster)?, Err(_) if start_cluster > 2 => find_free_cluster(fat, fat_type, 2, start_cluster)?,
Err(e) => return Err(e), Err(e) => return Err(e),