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:     jack@suse.com
Cc:     linux-kernel@vger.kernel.org, Chengguang Xu <cgxu519@mykernel.net>
Message-ID: <20191117132028.19564-1-cgxu519@mykernel.net>
Subject: [PATCH] quota: remove unnecessary check in dquot_add_inodes() and dquot_add_space()
Date:   Sun, 17 Nov 2019 21:20:28 +0800
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=utf8
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

After passed grace time we treat softlimit as hardlimit,
so we don't have to compare desire usage with softlimit
in this place.

Signed-off-by: Chengguang Xu <cgxu519@mykernel.net>
---
 fs/quota/dquot.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
index 6e826b454082..97740077afac 100644
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -1283,7 +1283,6 @@ static int dquot_add_inodes(struct dquot *dquot, qsiz=
e_t inodes,
 =09}
=20
 =09if (dquot->dq_dqb.dqb_isoftlimit &&
-=09    newinodes > dquot->dq_dqb.dqb_isoftlimit &&
 =09    dquot->dq_dqb.dqb_itime &&
 =09    ktime_get_real_seconds() >=3D dquot->dq_dqb.dqb_itime &&
             !ignore_hardlimit(dquot)) {
@@ -1333,7 +1332,6 @@ static int dquot_add_space(struct dquot *dquot, qsize=
_t space,
 =09}
=20
 =09if (dquot->dq_dqb.dqb_bsoftlimit &&
-=09    tspace > dquot->dq_dqb.dqb_bsoftlimit &&
 =09    dquot->dq_dqb.dqb_btime &&
 =09    ktime_get_real_seconds() >=3D dquot->dq_dqb.dqb_btime &&
             !ignore_hardlimit(dquot)) {
--=20
2.21.0