From 1ed3d8a1fffdcf3304a9826729bb571b63ad5778 Mon Sep 17 00:00:00 2001
From: tianzy <tianzy>
Date: Wed, 17 Oct 2007 07:23:08 +0000
Subject: [PATCH] a patch of b1_4 and b1_6 is ported to head b=13351 r=green
r=adilger
---
lustre/obdfilter/filter.c | 4 ++--
lustre/quota/quota_master.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c
index 2c1d80d5ee..76ba29c739 100644
--- a/lustre/obdfilter/filter.c
+++ b/lustre/obdfilter/filter.c
@@ -3713,8 +3713,8 @@ cleanup:
rc2 = lquota_adjust(filter_quota_interface_ref, obd, qcids, NULL, rc,
FSFILT_OP_UNLINK);
- CDEBUG(rc ? D_ERROR : D_QUOTA,
- "filter adjust qunit! (rc:%d)\n", rc? rc : rc2);
+ if (rc2)
+ CDEBUG(D_QUOTA, "filter adjust qunit! (rc:%d)\n", rc2);
return rc;
}
diff --git a/lustre/quota/quota_master.c b/lustre/quota/quota_master.c
index f007b68477..f89210705f 100644
--- a/lustre/quota/quota_master.c
+++ b/lustre/quota/quota_master.c
@@ -335,7 +335,7 @@ int filter_quota_adjust(struct obd_device *obd, unsigned int qcids[],
int rc2 = 0;
ENTRY;
- if (rc && rc != -EDQUOT && rc != ENOLCK)
+ if (rc && rc != -EDQUOT)
RETURN(0);
switch (opc) {
--
GitLab