]> git.baikalelectronics.ru Git - kernel.git/commit
minix zmap block counts calculation fix
authorQi Yong <qiyong@fc-cn.com>
Fri, 8 Aug 2014 21:20:29 +0000 (14:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Aug 2014 22:57:20 +0000 (15:57 -0700)
commitb67ff1d316dcbd9cc5cb0e69014d22c8da23fddf
treeda2c90e980961139efe805e820f0fdb1d0a61b57
parent0b76832bbda0f2a20494dd361c3a39a12321a4e5
minix zmap block counts calculation fix

The original 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 commit 7fa5fde4223e ("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".

This patch corrects that zmap blocks calculation and tidy a printk
message while at it.

Signed-off-by: Qi Yong <qiyong@fc-cn.com>
Cc: Josh Boyer <jwboyer@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/minix/bitmap.c
fs/minix/inode.c