minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-11 13:08:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

fat: fix unaligned errors

Browse Source 
A couple of buffers in the fat code are declared as an array of bytes.
But it is then cast up to a structure with 16bit and 32bit members.
Since GCC assumes structure alignment here, we have to force the
buffers to be aligned according to the structure usage.

Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Bryan Wu 2009-01-02 20:47:45 -05:00 committed by Wolfgang Denk
parent 68f8718df2
commit 7e4b9b4f6f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/fat/fat.c
View File

@ -434,7 +434,8 @@ slot2str(dir_slot *slotptr, char *l_name, int *idx)
* into 'retdent' * into 'retdent'
* Return 0 on success, -1 otherwise. * Return 0 on success, -1 otherwise.
*/ */
__u8 get_vfatname_block[MAX_CLUSTSIZE]; __attribute__ ((__aligned__(__alignof__(dir_entry))))
__u8 get_vfatname_block[MAX_CLUSTSIZE];
static int static int
get_vfatname(fsdata *mydata, int curclust, __u8 *cluster, get_vfatname(fsdata *mydata, int curclust, __u8 *cluster,
dir_entry *retdent, char *l_name) dir_entry *retdent, char *l_name)
@ -520,6 +521,7 @@ mkcksum(const char *str)
* Get the directory entry associated with 'filename' from the directory * Get the directory entry associated with 'filename' from the directory
* starting at 'startsect' * starting at 'startsect'
*/ */
__attribute__ ((__aligned__(__alignof__(dir_entry))))
__u8 get_dentfromdir_block[MAX_CLUSTSIZE]; __u8 get_dentfromdir_block[MAX_CLUSTSIZE];
static dir_entry *get_dentfromdir (fsdata * mydata, int startsect, static dir_entry *get_dentfromdir (fsdata * mydata, int startsect,
char *filename, dir_entry * retdent, char *filename, dir_entry * retdent,
@ -725,8 +727,8 @@ read_bootsectandvi(boot_sector *bs, volume_info *volinfo, int *fatsize)
return -1; return -1;
} }
__attribute__ ((__aligned__(__alignof__(dir_entry))))
__u8 do_fat_read_block[MAX_CLUSTSIZE]; /* Block buffer */ __u8 do_fat_read_block[MAX_CLUSTSIZE];
long long
do_fat_read (const char *filename, void *buffer, unsigned long maxsize, do_fat_read (const char *filename, void *buffer, unsigned long maxsize,
int dols) int dols)