diff options
| author | Vladimir Serbinenko <phcoder@gmail.com> | 2012-07-30 14:42:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-30 17:25:19 -0700 |
| commit | 6ed6a722f9abac25b0549e7507a2b745ede4475c (patch) | |
| tree | e4abd14e4d767d37010df501e0941fd826590522 | |
| parent | 8dccaf0607b3e047680952d0baf4da0486fbbcc1 (diff) | |
| download | op-kernel-dev-6ed6a722f9abac25b0549e7507a2b745ede4475c.zip op-kernel-dev-6ed6a722f9abac25b0549e7507a2b745ede4475c.tar.gz | |
minixfs: fix block limit check
On minix2 and minix3 usually max_size is 7fffffff and the check in
question prohibits creation of last block spanning right before 7fffffff,
due to downward rounding during the division. Fix it by using
multiplication instead.
[akpm@linux-foundation.org: fix up code layout, use local `sb']
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/minix/itree_v2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/minix/itree_v2.c b/fs/minix/itree_v2.c index 13487ad..78e2d93 100644 --- a/fs/minix/itree_v2.c +++ b/fs/minix/itree_v2.c @@ -32,7 +32,8 @@ static int block_to_path(struct inode * inode, long block, int offsets[DEPTH]) if (block < 0) { printk("MINIX-fs: block_to_path: block %ld < 0 on dev %s\n", block, bdevname(sb->s_bdev, b)); - } else if (block >= (minix_sb(inode->i_sb)->s_max_size/sb->s_blocksize)) { + } else if ((u64)block * (u64)sb->s_blocksize >= + minix_sb(sb)->s_max_size) { if (printk_ratelimit()) printk("MINIX-fs: block_to_path: " "block %ld too big on dev %s\n", |
