From: Chengguang Xu <cgxu519@mykernel.net>
Date: Sat, 4 Jan 2020 14:20:03 +0000 (+0800)
Subject: f2fs: fix miscounted block limit in f2fs_statfs_project()
X-Git-Tag: v4.19.103~114
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d38118184d0db5c509bd7fde800e632abad8c99e;p=thirdparty%2Fkernel%2Fstable.git

f2fs: fix miscounted block limit in f2fs_statfs_project()

commit acdf2172172a511f97fa21ed0ee7609a6d3b3a07 upstream.

statfs calculates Total/Used/Avail disk space in block unit,
so we should translate soft/hard prjquota limit to block unit
as well.

Below testing result shows the block/inode numbers of
Total/Used/Avail from df command are all correct afer
applying this patch.

[root@localhost quota-tools]\# ./repquota -P /dev/sdb1
---

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 662c7de58b990..379933da5c858 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1154,6 +1154,8 @@ static int f2fs_statfs_project(struct super_block *sb,
 	if (dquot->dq_dqb.dqb_bhardlimit &&
 			(!limit || dquot->dq_dqb.dqb_bhardlimit < limit))
 		limit = dquot->dq_dqb.dqb_bhardlimit;
+	if (limit)
+		limit >>= sb->s_blocksize_bits;
 
 	if (limit && buf->f_blocks > limit) {
 		curblock = dquot->dq_dqb.dqb_curspace >> sb->s_blocksize_bits;