From f4c54e76eefa9b72b94f5d2886d2398bc81aa94c Mon Sep 17 00:00:00 2001
From: tianzy <tianzy>
Date: Thu, 24 Jan 2008 07:46:43 +0000
Subject: [PATCH] Branch b1_6 fix an improper CERROR b=14567 i=johann i=andrew
---
lustre/quota/quota_master.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/lustre/quota/quota_master.c b/lustre/quota/quota_master.c
index 91b5719287..1f7f747cf7 100644
--- a/lustre/quota/quota_master.c
+++ b/lustre/quota/quota_master.c
@@ -468,7 +468,8 @@ int mds_quota_adjust(struct obd_device *obd, unsigned int qcids[],
}
if (rc2)
- CERROR("mds adjust qunit failed! (opc:%d rc:%d)\n", opc, rc2);
+ CDEBUG(rc2 == -EAGAIN ? D_QUOTA: D_ERROR,
+ "mds adjust qunit failed! (opc:%d rc:%d)\n", opc, rc2);
RETURN(0);
}
@@ -499,9 +500,14 @@ int filter_quota_adjust(struct obd_device *obd, unsigned int qcids[],
break;
}
- if (rc || rc2)
- CERROR("filter adjust qunit failed! (opc:%d rc%d)\n",
- opc, rc ?: rc2);
+ if (rc || rc2) {
+ if (!rc)
+ rc = rc2;
+ CDEBUG(rc == -EAGAIN ? D_QUOTA: D_ERROR,
+ "filter adjust qunit failed! (opc:%d rc%d)\n",
+ opc, rc);
+ }
+
RETURN(0);
}
--
GitLab