Received-SPF: pass (google.com: best guess record for domain of linux-ext4-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Chengguang Xu <cgxu519@mykernel.net>
To:     tytso@mit.edu, adilger.kernel@dilger.ca
Cc:     linux-ext4@vger.kernel.org, Chengguang Xu <cgxu519@mykernel.net>
Message-ID: <20200210082445.2379-1-cgxu519@mykernel.net>
Subject: [PATCH] ext4: code cleanup for ext4_statfs_project()
Date:   Mon, 10 Feb 2020 16:24:45 +0800
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=utf8
Sender: linux-ext4-owner@vger.kernel.org
Precedence: bulk

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

Signed-off-by: Chengguang Xu <cgxu519@mykernel.net>
---
 fs/ext4/super.c | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 8434217549b3..5fc1f47f4c6f 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -5585,13 +5585,8 @@ static int ext4_statfs_project(struct super_block *s=
b,
 =09=09return PTR_ERR(dquot);
 =09spin_lock(&dquot->dq_dqb_lock);
=20
-=09limit =3D 0;
-=09if (dquot->dq_dqb.dqb_bsoftlimit &&
-=09    (!limit || dquot->dq_dqb.dqb_bsoftlimit < limit))
-=09=09limit =3D dquot->dq_dqb.dqb_bsoftlimit;
-=09if (dquot->dq_dqb.dqb_bhardlimit &&
-=09    (!limit || dquot->dq_dqb.dqb_bhardlimit < limit))
-=09=09limit =3D dquot->dq_dqb.dqb_bhardlimit;
+=09limit =3D min_not_zero(dquot->dq_dqb.dqb_bsoftlimit,
+=09=09=09=09dquot->dq_dqb.dqb_bhardlimit);
 =09limit >>=3D sb->s_blocksize_bits;
=20
 =09if (limit && buf->f_blocks > limit) {
@@ -5603,14 +5598,8 @@ static int ext4_statfs_project(struct super_block *s=
b,
 =09=09=09 (buf->f_blocks - curblock) : 0;
 =09}
=20
-=09limit =3D 0;
-=09if (dquot->dq_dqb.dqb_isoftlimit &&
-=09    (!limit || dquot->dq_dqb.dqb_isoftlimit < limit))
-=09=09limit =3D dquot->dq_dqb.dqb_isoftlimit;
-=09if (dquot->dq_dqb.dqb_ihardlimit &&
-=09    (!limit || dquot->dq_dqb.dqb_ihardlimit < limit))
-=09=09limit =3D dquot->dq_dqb.dqb_ihardlimit;
-
+=09limit =3D min_not_zero(dquot->dq_dqb.dqb_isoftlimit,
+=09=09=09=09dquot->dq_dqb.dqb_ihardlimit);
 =09if (limit && buf->f_files > limit) {
 =09=09buf->f_files =3D limit;
 =09=09buf->f_ffree =3D
--=20
2.21.1