fs/minix: remove expected error message in block_to_path()
[ Upstream commit5.4-rM2-2.2.x-imx-squashedf666f9fb9a
] 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:1da177e4c3
("Linux-2.6.12-rc2") Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Andrew 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: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
parent
d91005b645
commit
ba40d33e36
|
@ -29,12 +29,12 @@ static int block_to_path(struct inode * inode, long block, int offsets[DEPTH])
|
||||||
if (block < 0) {
|
if (block < 0) {
|
||||||
printk("MINIX-fs: block_to_path: block %ld < 0 on dev %pg\n",
|
printk("MINIX-fs: block_to_path: block %ld < 0 on dev %pg\n",
|
||||||
block, inode->i_sb->s_bdev);
|
block, inode->i_sb->s_bdev);
|
||||||
} else if ((u64)block * BLOCK_SIZE >= inode->i_sb->s_maxbytes) {
|
return 0;
|
||||||
if (printk_ratelimit())
|
}
|
||||||
printk("MINIX-fs: block_to_path: "
|
if ((u64)block * BLOCK_SIZE >= inode->i_sb->s_maxbytes)
|
||||||
"block %ld too big on dev %pg\n",
|
return 0;
|
||||||
block, inode->i_sb->s_bdev);
|
|
||||||
} else if (block < 7) {
|
if (block < 7) {
|
||||||
offsets[n++] = block;
|
offsets[n++] = block;
|
||||||
} else if ((block -= 7) < 512) {
|
} else if ((block -= 7) < 512) {
|
||||||
offsets[n++] = 7;
|
offsets[n++] = 7;
|
||||||
|
|
|
@ -32,12 +32,12 @@ static int block_to_path(struct inode * inode, long block, int offsets[DEPTH])
|
||||||
if (block < 0) {
|
if (block < 0) {
|
||||||
printk("MINIX-fs: block_to_path: block %ld < 0 on dev %pg\n",
|
printk("MINIX-fs: block_to_path: block %ld < 0 on dev %pg\n",
|
||||||
block, sb->s_bdev);
|
block, sb->s_bdev);
|
||||||
} else if ((u64)block * (u64)sb->s_blocksize >= sb->s_maxbytes) {
|
return 0;
|
||||||
if (printk_ratelimit())
|
}
|
||||||
printk("MINIX-fs: block_to_path: "
|
if ((u64)block * (u64)sb->s_blocksize >= sb->s_maxbytes)
|
||||||
"block %ld too big on dev %pg\n",
|
return 0;
|
||||||
block, sb->s_bdev);
|
|
||||||
} else if (block < DIRCOUNT) {
|
if (block < DIRCOUNT) {
|
||||||
offsets[n++] = block;
|
offsets[n++] = block;
|
||||||
} else if ((block -= DIRCOUNT) < INDIRCOUNT(sb)) {
|
} else if ((block -= DIRCOUNT) < INDIRCOUNT(sb)) {
|
||||||
offsets[n++] = DIRCOUNT;
|
offsets[n++] = DIRCOUNT;
|
||||||
|
|
Loading…
Reference in New Issue