Merge tag 'timers_urgent_for_v5.15_rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / fs / minix / itree_v1.c

diff --git a/fs/minix/itree_v1.c b/fs/minix/itree_v1.c
index 046cc96..1fed906 100644 (file)
--- a/fs/minix/itree_v1.c
+++ b/fs/minix/itree_v1.c
@@ -29,12 +29,12 @@ 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 %pg\n",
                        block, inode->i_sb->s_bdev);
-       } else if (block >= (minix_sb(inode->i_sb)->s_max_size/BLOCK_SIZE)) {
-               if (printk_ratelimit())
-                       printk("MINIX-fs: block_to_path: "
-                              "block %ld too big on dev %pg\n",
-                               block, inode->i_sb->s_bdev);
-       } else if (block < 7) {
+               return 0;
+       }
+       if ((u64)block * BLOCK_SIZE >= inode->i_sb->s_maxbytes)
+               return 0;
+
+       if (block < 7) {
                offsets[n++] = block;
        } else if ((block -= 7) < 512) {
                offsets[n++] = 7;