Merge tag 'reset-fixes-for-v5.19' of git://git.pengutronix.de/pza/linux into arm...

[linux-2.6-microblaze.git] / fs / xfs / xfs_trans_dquot.c

diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c
index 9ba7e6b..aa00cf6 100644 (file)
--- a/fs/xfs/xfs_trans_dquot.c
+++ b/fs/xfs/xfs_trans_dquot.c
@@ -597,13 +597,11 @@ xfs_dqresv_check(
        if (softlimit && total_count > softlimit) {
                time64_t        now = ktime_get_real_seconds();
 
-               if ((res->timer != 0 && now > res->timer) ||
-                   (res->warnings != 0 && res->warnings >= qlim->warn)) {
+               if (res->timer != 0 && now > res->timer) {
                        *fatal = true;
                        return QUOTA_NL_ISOFTLONGWARN;
                }
 
-               res->warnings++;
                return QUOTA_NL_ISOFTWARN;
        }