diff options
author | Eric Sandeen <sandeen@redhat.com> | 2006-11-02 22:07:05 -0800 |
---|---|---|
committer | Chris Wright <chrisw@sous-sol.org> | 2006-11-18 19:28:00 -0800 |
commit | bde6977b2ce5d012114c3e748c7d4fc1189b34ec (patch) | |
tree | e278b75d17efe743b470f733f6af1e539e99f6a8 | |
parent | 459e0483aef6bb6845edab97fc6731dabe02120c (diff) | |
download | lwn-bde6977b2ce5d012114c3e748c7d4fc1189b34ec.tar.gz lwn-bde6977b2ce5d012114c3e748c7d4fc1189b34ec.zip |
[PATCH] fix UFS superblock alignment issues
ufs2 fails to mount on x86_64, claiming bad magic. This is because
ufs_super_block_third's fs_un1 member is padded out by 4 bytes for 8-byte
alignment, pushing down the rest of the struct.
Forcing this to be packed solves it. I took a quick look over other
on-disk structures and didn't immediately find other problems. I was able
to mount & ls a populated ufs2 filesystem w/ this change.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Cc: Evgeniy Dushistov <dushistov@mail.ru>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
-rw-r--r-- | include/linux/ufs_fs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ufs_fs.h b/include/linux/ufs_fs.h index fc62887c5206..aa6832b23be0 100644 --- a/include/linux/ufs_fs.h +++ b/include/linux/ufs_fs.h @@ -900,7 +900,7 @@ struct ufs_super_block_third { __fs64 fs_csaddr; /* blk addr of cyl grp summary area */ __fs64 fs_pendingblocks;/* blocks in process of being freed */ __fs32 fs_pendinginodes;/*inodes in process of being freed */ - } fs_u2; + } __attribute__ ((packed)) fs_u2; } fs_un1; union { struct { |