---

yaml --- r: 294603 b: refs/heads/master c: 33e0eda h: refs/heads/master i: 294601: 40de8a7 294599: a2a341d v: v3
git-mirror · Feb 21, 2012 · 127d427 · 127d427
1 parent 407bb7a
commit 127d427
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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,