diff options
author | Chen Zhongjin | 2022-12-09 18:04:48 +0800 |
---|---|---|
committer | Greg Kroah-Hartman | 2022-12-31 13:32:00 +0100 |
commit | c8d1f3d1b25b5ccea7a54f9eed58d4ad4389afc5 (patch) | |
tree | 04320aea8da5076c7d690d47b629dbcc467fa7f0 /fs | |
parent | b6dccca21b1fd481a6ba2a3cb3defa7c09c23343 (diff) |
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>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/sysv/itree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/sysv/itree.c b/fs/sysv/itree.c index d4ec9bb97de9..3b8567564e7e 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, |