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

Commit 7aa5325e authored by Chen Zhongjin's avatar Chen Zhongjin Committed by Greg Kroah-Hartman
Browse files

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: 1da177e4 ("Linux-2.6.12-rc2")
Signed-off-by: default avatarChen Zhongjin <chenzhongjin@huawei.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent cb585960

fs/sysv/itree.c

+1 −1
Original line number Diff line number Diff line
@@ -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(const struct path *path, struct kstat *stat,