From 2882cb943409be6ae859b1340602e607edadccac Mon Sep 17 00:00:00 2001 From: johann Date: Wed, 14 Oct 2009 08:39:29 +0000 Subject: [PATCH] Branch b1_8 b=18630 i=johann Don't LBUG on release quota error. Just a workaround until the problem is understood (and it is now). --- lustre/quota/quota_context.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/lustre/quota/quota_context.c b/lustre/quota/quota_context.c index 4bd3381..d08fa45 100644 --- a/lustre/quota/quota_context.c +++ b/lustre/quota/quota_context.c @@ -650,15 +650,18 @@ dqacq_completion(struct obd_device *obd, struct lustre_quota_ctxt *qctxt, INC_QLIMIT(*hardlimit, count); break; case QUOTA_DQREL: - LASSERTF(count < *hardlimit, - "id(%u) flag(%u) type(%c) isblk(%c) " - "count("LPU64") qd_qunit("LPU64") " - "hardlimit("LPU64").\n", - qdata->qd_id, qdata->qd_flags, - QDATA_IS_GRP(qdata) ? 'g' : 'u', - QDATA_IS_BLK(qdata) ? 'b': 'i', - qdata->qd_count, qdata->qd_qunit, *hardlimit); - *hardlimit -= count; + if (count >= *hardlimit) + CERROR("release quota error: id(%u) flag(%u) " + "type(%c) isblk(%c) count("LPU64") " + "qd_qunit("LPU64") hardlimit("LPU64") " + "qdata(%p)\n", + qdata->qd_id, qdata->qd_flags, + QDATA_IS_GRP(qdata) ? 'g' : 'u', + QDATA_IS_BLK(qdata) ? 'b': 'i', + qdata->qd_count, qdata->qd_qunit, *hardlimit, + qdata); + else + *hardlimit -= count; break; default: LBUG(); -- 1.8.3.1