diff options
| author | Dave Chinner <david@fromorbit.com> | 2022-05-12 15:23:07 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2022-05-12 15:23:07 +1000 |
| commit | efd409a4329f6927795be5ae080cd3ec8c014f49 (patch) | |
| tree | b4fc7e39dbe9a94ec0a74f22760624fc7a752202 /fs/xfs/xfs_trans_dquot.c | |
| parent | 45ff8b471cdc58701a7ba5c5dcd8dfc57ae06829 (diff) | |
| parent | 5349b2afc117d87d35502f2fe1930692d6bfc68b (diff) | |
Merge branch 'xfs-5.19-quota-warn-remove' into xfs-5.19-for-nextxfs-5.19-for-linus
Diffstat (limited to 'fs/xfs/xfs_trans_dquot.c')
| -rw-r--r-- | fs/xfs/xfs_trans_dquot.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c index ebe2c227eb2f..aa00cf67ad72 100644 --- a/fs/xfs/xfs_trans_dquot.c +++ b/fs/xfs/xfs_trans_dquot.c @@ -597,8 +597,7 @@ 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; } |