From: Chen Zhongjin <chenzhongjin@huawei.com>
Date: Fri, 9 Dec 2022 10:04:48 +0000 (+0800)
Subject: fs: sysv: Fix sysv_nblocks() returns wrong value
X-Git-Tag: v6.1.8~1777
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c8d1f3d1b25b5ccea7a54f9eed58d4ad4389afc5;p=platform%2Fkernel%2Flinux-starfive.git

fs: sysv: Fix sysv_nblocks() returns wrong value

[ Upstream commit e0c49bd2b4d3cd1751491eb2d940bce968ac65e9 ]

sysv_nblocks() returns 'blocks' rather than 'res', which only counting
the number of triple-indirect blocks and causing sysv_getattr() gets a
wrong result.

[AV: this is actually a sysv counterpart of minixfs fix -
0fcd426de9d0 "[PATCH] minix block usage counting fix" in
historical tree; mea culpa, should've thought to check
fs/sysv back then...]

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Chen Zhongjin <chenzhongjin@huawei.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/fs/sysv/itree.c b/fs/sysv/itree.c
index d4ec9bb..3b85675 100644
--- a/fs/sysv/itree.c
+++ b/fs/sysv/itree.c
@@ -438,7 +438,7 @@ static unsigned sysv_nblocks(struct super_block *s, loff_t size)
 		res += blocks;
 		direct = 1;
 	}
-	return blocks;
+	return res;
 }
 
 int sysv_getattr(struct user_namespace *mnt_userns, const struct path *path,