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",