Branch b1_6

fix an improper CERROR
b=14567
i=johann
i=andrew

diff --git a/lustre/quota/quota_master.c b/lustre/quota/quota_master.c
index 91b5719..1f7f747 100644 (file)
--- 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);
 }