korg/e2fsprogs
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git synced 2024-11-28 20:44:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

misc: fix alignment warnings on ARM

Browse Source 
Some temporary char buffers allocated on the stack are not properly
aligned when typecast to a structure containing __u32 or __u64 types,
and this can cause alignment warnings on ARM and other alignment
sensitive architectures, and potential slowdowns to do fixups.

Fix the buffer alignment to avoid such issues.

Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=680090

Reported-by: Gordan Bobic <gordan.bobic@gmail.com>
Signed-off-by: Andreas Dilger <adilger@dilger.ca>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Andreas Dilger 2015-05-22 16:40:51 -06:00 committed by Theodore Ts'o
parent 7cb2ed25b1
commit 59707c1b58
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc/filefrag.c
View File

@ -198,7 +198,7 @@ static void print_extent_info(struct fiemap_extent *fm_extent, int cur_ex,
static int filefrag_fiemap(int fd, int blk_shift, int *num_extents,
ext2fs_struct_stat *st)
{
char buf[16384];
__u64 buf[2048]; /* __u64 for proper field alignment */
struct fiemap *fiemap = (struct fiemap *)buf;
struct fiemap_extent *fm_ext = &fiemap->fm_extents[0];
int count = (sizeof(buf) - sizeof(*fiemap)) /

6
misc/tune2fs.c
View File

@ -226,7 +226,7 @@ static int remove_journal_device(ext2_filsys fs)
{
char *journal_path;
ext2_filsys jfs;
char buf[SUPERBLOCK_SIZE];
char buf[SUPERBLOCK_SIZE] __attribute__ ((aligned(8)));
journal_superblock_t *jsb;
int i, nr_users;
errcode_t retval;
@ -1936,7 +1936,7 @@ fs_update_journal_user(struct ext2_super_block *sb, __u8 old_uuid[UUID_SIZE])
__u8 *j_uuid;
char *journal_path;
char uuid[UUID_STR_SIZE];
char buf[SUPERBLOCK_SIZE];
char buf[SUPERBLOCK_SIZE] __attribute__ ((aligned(8)));
if (!(sb->s_feature_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL) ||
uuid_is_null(sb->s_journal_uuid))
@ -2279,7 +2279,7 @@ retry_open:
if (U_flag) {
int set_csum = 0;
dgrp_t i;
char buf[SUPERBLOCK_SIZE];
char buf[SUPERBLOCK_SIZE] __attribute__ ((aligned(8)));
__u8 old_uuid[UUID_SIZE];
if (sb->s_feature_ro_compat &