From 55d697384b125720dabeb5553a051788379d3d1b Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 30 Jul 2012 14:42:00 -0700 Subject: [PATCH] --- yaml --- r: 319959 b: refs/heads/master c: 6ed6a722f9abac25b0549e7507a2b745ede4475c h: refs/heads/master i: 319957: 89861c428ad3338d22c7e9c17e20a3076c1fa078 319955: afd87c327ff80c2de4a4671f59e180543a884a03 319951: 509d739a6cdbb65dd66ec957907efac1304a04b3 v: v3 --- [refs] | 2 +- trunk/fs/minix/itree_v2.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a1357b3d277a..529dd88e74f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8dccaf0607b3e047680952d0baf4da0486fbbcc1 +refs/heads/master: 6ed6a722f9abac25b0549e7507a2b745ede4475c diff --git a/trunk/fs/minix/itree_v2.c b/trunk/fs/minix/itree_v2.c index 13487ad16894..78e2d93e5c83 100644 --- a/trunk/fs/minix/itree_v2.c +++ b/trunk/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",