From 127d427f74625a1cef6be2ddfcb53fe932cf30d0 Mon Sep 17 00:00:00 2001 From: Mitsuo Hayasaka Date: Mon, 6 Feb 2012 12:50:30 +0000 Subject: [PATCH] --- yaml --- r: 294603 b: refs/heads/master c: 33e0edafd78d83273c14b14501cff063fac528e5 h: refs/heads/master i: 294601: 40de8a746d19dbbeb0d3efe6ac801f4a692d5b2e 294599: a2a341d8a1c80de1c93e6ef719551fb38d1ab470 v: v3 --- [refs] | 2 +- trunk/fs/xfs/xfs_trans_dquot.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4c54419941c2..947fea993e18 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d0a3fe67e30261bb2018d2a06f33ff3303438c8e +refs/heads/master: 33e0edafd78d83273c14b14501cff063fac528e5 diff --git a/trunk/fs/xfs/xfs_trans_dquot.c b/trunk/fs/xfs/xfs_trans_dquot.c index 85255536b4b6..c4ba366d24e6 100644 --- a/trunk/fs/xfs/xfs_trans_dquot.c +++ b/trunk/fs/xfs/xfs_trans_dquot.c @@ -677,11 +677,13 @@ xfs_trans_dqresv( if (!softlimit) softlimit = q->qi_isoftlimit; - if (hardlimit > 0ULL && count >= hardlimit) { + if (hardlimit > 0ULL && + hardlimit < ninos + count) { xfs_quota_warn(mp, dqp, QUOTA_NL_IHARDWARN); goto error_return; } - if (softlimit > 0ULL && count >= softlimit) { + if (softlimit > 0ULL && + softlimit < ninos + count) { if ((timer != 0 && get_seconds() > timer) || (warns != 0 && warns >= warnlimit)) { xfs_quota_warn(mp, dqp,