Branch b1_8

Lustre returns an EQUOTA error before hitting the block quota hardlimit
b=16645
i=johann
i=panda

diff --git a/lustre/quota/quota_context.c b/lustre/quota/quota_context.c
index fed2295..ef74ccc 100644 (file)
--- a/lustre/quota/quota_context.c
+++ b/lustre/quota/quota_context.c
@@ -320,6 +320,12 @@ check_cur_qunit(struct obd_device *obd,
                        limit_org > qdata->qd_count + qunit_sz)
                         qdata->qd_count += qunit_sz;
                 ret = 2;
+                /* if there are other pending writes for this uid/gid, releasing
+                 * quota is put off until the last pending write b=16645 */
+                if (ret == 2 && pending_write) {
+                        CDEBUG(D_QUOTA, "delay quota release\n");
+                        ret = 0;
+                }
         }
         CDEBUG(D_QUOTA, "type: %c, limit: "LPU64", usage: "LPU64
                ", pending_write: "LPU64", record: "LPD64