f2fs: choose hardlimit when softlimit is larger than hardlimit in f2fs_statfs_project()

BugLink: https://bugs.launchpad.net/bugs/1866678
commit 909110c060f22e65756659ec6fa957ae75777e00 upstream.

Setting softlimit larger than hardlimit seems meaningless
for disk quota but currently it is allowed. In this case,
there may be a bit of comfusion for users when they run
df comamnd to directory which has project quota.

For example, we set 20M softlimit and 10M hardlimit of
block usage limit for project quota of test_dir(project id 123).

[root@hades f2fs]# repquota -P -a

Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 897d5f02d06bcaad2eefd4e53458da6793422e00..9c492a529cd5e99181845bf3e0ee995aa9a4fe15 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -961,9 +961,13 @@ static int f2fs_statfs_project(struct super_block *sb,
                return PTR_ERR(dquot);
        spin_lock(&dq_data_lock);
 
-       limit = (dquot->dq_dqb.dqb_bsoftlimit ?
-                dquot->dq_dqb.dqb_bsoftlimit :
-                dquot->dq_dqb.dqb_bhardlimit) >> sb->s_blocksize_bits;
+       limit = 0;
+       if (dquot->dq_dqb.dqb_bsoftlimit)
+               limit = dquot->dq_dqb.dqb_bsoftlimit;
+       if (dquot->dq_dqb.dqb_bhardlimit &&
+                       (!limit || dquot->dq_dqb.dqb_bhardlimit < limit))
+               limit = dquot->dq_dqb.dqb_bhardlimit;
+
        if (limit && buf->f_blocks > limit) {
                curblock = dquot->dq_dqb.dqb_curspace >> sb->s_blocksize_bits;
                buf->f_blocks = limit;
@@ -972,9 +976,13 @@ static int f2fs_statfs_project(struct super_block *sb,
                         (buf->f_blocks - curblock) : 0;
        }
 
-       limit = dquot->dq_dqb.dqb_isoftlimit ?
-               dquot->dq_dqb.dqb_isoftlimit :
-               dquot->dq_dqb.dqb_ihardlimit;
+       limit = 0;
+       if (dquot->dq_dqb.dqb_isoftlimit)
+               limit = dquot->dq_dqb.dqb_isoftlimit;
+       if (dquot->dq_dqb.dqb_ihardlimit &&
+                       (!limit || dquot->dq_dqb.dqb_ihardlimit < limit))
+               limit = dquot->dq_dqb.dqb_ihardlimit;
+
        if (limit && buf->f_files > limit) {
                buf->f_files = limit;
                buf->f_ffree =