tyler.durden/kernel
1
0
Fork 0
mirror of https://github.com/FDOS/kernel.git synced 2025-07-29 00:34:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make free cluster search circular in case the FSINFO/DPB value is not correct

Browse Source 
and there is a free cluster before the given value.
Also, when calculating free space we get the first free cluster for free.


git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@1632 6ac86273-5f31-0410-b378-82cca8765d1b
This commit is contained in:
Bart Oldeman 2011-06-13 16:29:14 +00:00
parent aab06b8a4d
commit ac7f32468b
1 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
kernel/fatfs.c
View File

@ -692,7 +692,7 @@ time dos_gettime(void)
/* */ /* */
STATIC CLUSTER find_fat_free(f_node_ptr fnp) STATIC CLUSTER find_fat_free(f_node_ptr fnp)
{ {
REG CLUSTER idx, size; REG CLUSTER idx, size, cluster;
struct dpb FAR *dpbp = fnp->f_dpb; struct dpb FAR *dpbp = fnp->f_dpb;
#ifdef DISPLAY_GETBLOCK #ifdef DISPLAY_GETBLOCK
@ -717,39 +717,41 @@ STATIC CLUSTER find_fat_free(f_node_ptr fnp)
/* Search the FAT table looking for the first free */ /* Search the FAT table looking for the first free */
/* entry. */ /* entry. */
for (; idx <= size; idx++) cluster = idx;
for (;;)
{ {
#ifdef CHECK_FAT_DURING_CLUSTER_ALLOC /* slower but nice side effect ;-) */ #ifdef CHECK_FAT_DURING_CLUSTER_ALLOC /* slower but nice side effect ;-) */
if (next_cluster(dpbp, idx) == FREE) if (next_cluster(dpbp, idx) == FREE)
#else #else
if (is_free_cluster(dpbp, idx)) if (is_free_cluster(dpbp, idx))
#endif #endif
{
cluster = idx;
break; break;
}
idx++;
/* wrap the search just in case there are free clusters before */
/* dpbp->dpb_(x)cluster (the fsinfo entry is just a hint!) */
if (idx > size) idx = 2;
if (idx == cluster) {
/* No empty clusters, disk is FULL! */
cluster = UNKNCLUSTER;
idx = LONG_LAST_CLUSTER;
break;
}
} }
#ifdef WITHFAT32 #ifdef WITHFAT32
if (ISFAT32(dpbp)) if (ISFAT32(dpbp))
{ {
dpbp->dpb_xcluster = idx; dpbp->dpb_xcluster = cluster;
if (idx > size)
{
/* No empty clusters, disk is FULL! */
dpbp->dpb_xcluster = UNKNCLUSTER;
idx = LONG_LAST_CLUSTER;
}
/* return the free entry */ /* return the free entry */
write_fsinfo(dpbp); write_fsinfo(dpbp);
return idx; return idx;
} }
#endif #endif
dpbp->dpb_cluster = (UWORD)idx; dpbp->dpb_cluster = (UWORD)cluster;
if ((UWORD)idx > (UWORD)size)
{
/* No empty clusters, disk is FULL! */
dpbp->dpb_cluster = UNKNCLUSTER;
idx = LONG_LAST_CLUSTER;
}
/* return the free entry */ /* return the free entry */
return idx; return idx;
} }
@ -1446,7 +1448,7 @@ CLUSTER dos_free(struct dpb FAR * dpbp)
/* There's an unwritten rule here. All fs */ /* There's an unwritten rule here. All fs */
/* cluster start at 2 and run to max_cluster+2 */ /* cluster start at 2 and run to max_cluster+2 */
REG CLUSTER i; REG CLUSTER i;
REG CLUSTER cnt = 0; REG CLUSTER cnt;
CLUSTER max_cluster = dpbp->dpb_size; CLUSTER max_cluster = dpbp->dpb_size;
#ifdef WITHFAT32 #ifdef WITHFAT32
@ -1461,6 +1463,7 @@ CLUSTER dos_free(struct dpb FAR * dpbp)
if (dpbp->dpb_nfreeclst != UNKNCLSTFREE) if (dpbp->dpb_nfreeclst != UNKNCLSTFREE)
return dpbp->dpb_nfreeclst; return dpbp->dpb_nfreeclst;
cnt = 0;
for (i = 2; i <= max_cluster; i++) for (i = 2; i <= max_cluster; i++)
{ {
#ifdef CHECK_FAT_DURING_SPACE_CHECK /* slower but nice side effect ;-) */ #ifdef CHECK_FAT_DURING_SPACE_CHECK /* slower but nice side effect ;-) */
@ -1468,7 +1471,19 @@ CLUSTER dos_free(struct dpb FAR * dpbp)
#else #else
if (is_free_cluster(dpbp, i)) if (is_free_cluster(dpbp, i))
#endif #endif
{
if (cnt == 0)
{
/* update first free cluster number */
#ifdef WITHFAT32
if (ISFAT32(dpbp))
dpbp->dpb_xcluster = i;
else
#endif
dpbp->dpb_cluster = (UWORD)i;
}
++cnt; ++cnt;
}
} }
#ifdef WITHFAT32 #ifdef WITHFAT32
if (ISFAT32(dpbp)) if (ISFAT32(dpbp))