aboutsummaryrefslogtreecommitdiffstats
path: root/fs/bfs
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-12-05 08:32:52 +0000
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-05 09:25:20 -0800
commit7e46aa5c8cb1347853de9ec86f3fa440f9dc9d77 (patch)
treeeb7fbee801b729e54e7826530175655fd6dce90f /fs/bfs
parent3c50b3683a8efbf3b4b314209d86aed1a0c44d5b (diff)
downloadkernel_samsung_smdk4412-7e46aa5c8cb1347853de9ec86f3fa440f9dc9d77.tar.gz
kernel_samsung_smdk4412-7e46aa5c8cb1347853de9ec86f3fa440f9dc9d77.tar.bz2
kernel_samsung_smdk4412-7e46aa5c8cb1347853de9ec86f3fa440f9dc9d77.zip
regression: bfs endianness bug
BFS_FILEBLOCKS() expects struct bfs_inode * (on-disk data, with little- endian fields), not struct bfs_inode_info * (in-core stuff, with host- endian ones). It's a macro and fields with the right names are present in bfs_inode_info, so it compiles, but on big-endian host it gives bogus results. Introduced in commit f433dc56344cb72cc3de5ba0819021cec3aef807 ("Fixes to the BFS filesystem driver"). Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/bfs')
-rw-r--r--fs/bfs/inode.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/bfs/inode.c b/fs/bfs/inode.c
index 294c41baef6..a64a71d444f 100644
--- a/fs/bfs/inode.c
+++ b/fs/bfs/inode.c
@@ -178,7 +178,8 @@ static void bfs_delete_inode(struct inode *inode)
brelse(bh);
if (bi->i_dsk_ino) {
- info->si_freeb += BFS_FILEBLOCKS(bi);
+ if (bi->i_sblock)
+ info->si_freeb += bi->i_eblock + 1 - bi->i_sblock;
info->si_freei++;
clear_bit(ino, info->si_imap);
dump_imap("delete_inode", s);