Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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:     jaegeuk@kernel.org, chao@kernel.org
Cc:     linux-f2fs-devel@lists.sourceforge.net,
        linux-kernel@vger.kernel.org, Chengguang Xu <cgxu519@mykernel.net>
Message-ID: <20200104142004.12883-2-cgxu519@mykernel.net>
Subject: [f2fs-dev][PATCH 2/2] f2fs: code cleanup for f2fs_statfs_project()
Date:   Sat,  4 Jan 2020 22:20:04 +0800
In-Reply-To: <20200104142004.12883-1-cgxu519@mykernel.net>
References: <20200104142004.12883-1-cgxu519@mykernel.net>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=utf8
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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

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

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 78efd0e76174..ac01c3f8863d 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1213,12 +1213,8 @@ static int f2fs_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=09limit =3D dquot->dq_dqb.dqb_bsoftlimit;
-=09if (dquot->dq_dqb.dqb_bhardlimit &&
-=09=09=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=09=09dquot->dq_dqb.dqb_bhardlimit);
 =09if (limit)
 =09=09limit >>=3D sb->s_blocksize_bits;
=20
@@ -1230,12 +1226,8 @@ static int f2fs_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=09limit =3D dquot->dq_dqb.dqb_isoftlimit;
-=09if (dquot->dq_dqb.dqb_ihardlimit &&
-=09=09=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=09=09dquot->dq_dqb.dqb_ihardlimit);
=20
 =09if (limit && buf->f_files > limit) {
 =09=09buf->f_files =3D limit;
--=20
2.21.1