Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f3fb90d authored by Eric Biggers's avatar Eric Biggers Committed by Greg Kroah-Hartman
Browse files

fs/minix: remove expected error message in block_to_path() 



[ Upstream commit f666f9fb9a36f1c833b9d18923572f0e4d304754 ]

When truncating a file to a size within the last allowed logical block,
block_to_path() is called with the *next* block.  This exceeds the limit,
causing the "block %ld too big" error message to be printed.

This case isn't actually an error; there are just no more blocks past that
point.  So, remove this error message.

Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Qiujun Huang <anenbupt@gmail.com>
Link: http://lkml.kernel.org/r/20200628060846.682158-7-ebiggers@kernel.org


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c7ac366b

fs/minix/itree_v1.c

+6 −6
Original line number Diff line number Diff line
@@ -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 ((u64)block * BLOCK_SIZE >= inode->i_sb->s_maxbytes) {

		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;

fs/minix/itree_v2.c

+6 −6
Original line number Diff line number Diff line
@@ -32,12 +32,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, sb->s_bdev);

	} else if ((u64)block * (u64)sb->s_blocksize >= sb->s_maxbytes) {

		if (printk_ratelimit())

			printk("MINIX-fs: block_to_path: "

			       "block %ld too big on dev %pg\n",

				block, sb->s_bdev);

	} else if (block < DIRCOUNT) {

		return 0;

	}

	if ((u64)block * (u64)sb->s_blocksize >= sb->s_maxbytes)

		return 0;



	if (block < DIRCOUNT) {

		offsets[n++] = block;

	} else if ((block -= DIRCOUNT) < INDIRCOUNT(sb)) {

		offsets[n++] = DIRCOUNT;