From 6962450022900f42f33fe7dc16af7c72a46ae3bb Mon Sep 17 00:00:00 2001 From: Mitsuo Hayasaka Date: Mon, 6 Feb 2012 12:50:30 +0000 Subject: [PATCH] --- yaml --- r: 287837 b: refs/heads/master c: c922bbc819324558e61402a7a76c10c550ca61bc h: refs/heads/master i: 287835: 6622157b146286e62aeb2243f600323f5363c581 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 3883598cbbae..022895d00008 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20f12d8ac01917d96860f352f67eddd912df0afb +refs/heads/master: c922bbc819324558e61402a7a76c10c550ca61bc 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,