minix zmap block counts calculation fix
PATCH 1/1 minix zmap block counts calculation fix
Hello,
The original Linus' minix zmap blocks calculation was correct, in the formula of: sbi->s_nzones - sbi->s_firstdatazone + 1. It is (sp->s_zones
- (sp->s_firstdatazone - 1) in the minix3 source code.
But a later patch (fs/minix: Verify bitmap block counts before mounting) has changed it unfortunately as:
sbi->s_nzones - (sbi->s_firstdatazone + 1).
This would show free blocks one block less than the real when the total data blocks are in "full zmap blocks plus one".
commit 016e8d44bc06dd3322f26712bdd3f3a6973592d0
Author: Josh Boyer <[email protected]> Date: Fri Aug 19 14:50:26 2011 -0400
This patch corrects that zmap blocks calculation and tidy a printk message while at it.
Signed-off-by Qi Yong <[email protected]>
Signature · 1 line
Qi Yong
fs/minix/bitmap.c +1 -1
@@ -96,7 +96,7 @@ int minix_new_block(struct inode * inode)unsigned long minix_count_free_blocks (struct super_block *sb) {struct minix_sb_info *sbi =minix_sb (sb); -u32 bits = sbi->s_nzones - (sbi->s_firstdatazone +1 ); +u32 bits = sbi->s_nzones - sbi->s_firstdatazone +1 ;return (count_free (sbi->s_zmap, sb->s_blocksize, bits) << sbi->s_log_zone_size);
fs/minix/inode.c +2 -2
@@ -267,12 +267,12 @@ static int minix_fill_super(struct super_block *s, void *data, int silent) block =minix_blocks_needed (sbi->s_ninodes, s->s_blocksize);if (sbi->s_imap_blocks < block) {printk ("MINIX-fs: file system does not have enough " -"imap blocks allocated. Refusing to mount\n" ); +"imap blocks allocated. Refusing to mount.\n" ); goto out_no_bitmap; } block =minix_blocks_needed ( - (sbi->s_nzones - (sbi->s_firstdatazone +1 )), + (sbi->s_nzones - sbi->s_firstdatazone +1 ), s->s_blocksize);if (sbi->s_zmap_blocks < block) { printk("MINIX-fs: file system does not have enough "