ext4: code cleanup for ext4_statfs_project()

[ Upstream commit a08fe66e4a0e12a3df982b28059f3a90e0f1b31e ]

Calling min_not_zero() to simplify complicated prjquota
limit comparison in ext4_statfs_project().

Signed-off-by: Chengguang Xu <cgxu519@mykernel.net>
Link: https://lore.kernel.org/r/20200210082445.2379-1-cgxu519@mykernel.net
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Stable-dep-of: f87d3af74193 ("ext4: don't over-report free space or inodes in statvfs")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 8675b4dcc899daf24d992e696686de45ab3991c0..332849e17b2bd5c25b42049c286b654c484c2310 100644 (file)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -5680,10 +5680,8 @@ static int ext4_statfs_project(struct super_block *sb,
                return PTR_ERR(dquot);
        spin_lock(&dquot->dq_dqb_lock);
 
-       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;
+       limit = min_not_zero(dquot->dq_dqb.dqb_bsoftlimit,
+                            dquot->dq_dqb.dqb_bhardlimit);
        limit >>= sb->s_blocksize_bits;
 
        if (limit && buf->f_blocks > limit) {
@@ -5695,11 +5693,8 @@ static int ext4_statfs_project(struct super_block *sb,
                         (buf->f_blocks - curblock) : 0;
        }
 
-       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;
-
+       limit = min_not_zero(dquot->dq_dqb.dqb_isoftlimit,
+                            dquot->dq_dqb.dqb_ihardlimit);
        if (limit && buf->f_files > limit) {
                buf->f_files = limit;
                buf->f_ffree =