GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-19 05:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fat: root directory cluster only makes sense for FAT32

Browse source 
The root directory cluster field only exists in a FAT32 boot sector, so the
'root_cluster' variable in do_fat_read() contains garbage in case of FAT12/16.
Make it contain 0 instead as this is what is passed to get_vfatname() in that
case anyway.

Signed-off-by: Sergei Shtylyov <sshtylyov@mvista.com>
This commit is contained in:
Sergei Shtylyov 2011-08-19 09:32:34 +00:00 • committed by Wolfgang Denk
parent 60b36f0fc7
commit 40e219165b
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
fs/fat/fat.c
View file

@ -788,7 +788,7 @@ do_fat_read (const char *filename, void *buffer, unsigned long maxsize,
int files = 0, dirs = 0; int files = 0, dirs = 0;
long ret = -1; long ret = -1;
int firsttime; int firsttime;
__u32 root_cluster; __u32 root_cluster = 0;
int rootdir_size = 0; int rootdir_size = 0;
int j; int j;
@ -797,12 +797,12 @@ do_fat_read (const char *filename, void *buffer, unsigned long maxsize,
return -1; return -1;
} }
root_cluster = bs.root_cluster; if (mydata->fatsize == 32) {
root_cluster = bs.root_cluster;
if (mydata->fatsize == 32)
mydata->fatlength = bs.fat32_length; mydata->fatlength = bs.fat32_length;
else } else {
mydata->fatlength = bs.fat_length; mydata->fatlength = bs.fat_length;
}
mydata->fat_sect = bs.reserved; mydata->fat_sect = bs.reserved;
@ -904,9 +904,7 @@ do_fat_read (const char *filename, void *buffer, unsigned long maxsize,
((dir_slot *)dentptr)->alias_checksum; ((dir_slot *)dentptr)->alias_checksum;
get_vfatname(mydata, get_vfatname(mydata,
(mydata->fatsize == 32) ? root_cluster,
root_cluster :
0,
do_fat_read_block, do_fat_read_block,
dentptr, l_name); dentptr, l_name);