Branch b_release_1_8_1

b=19551
i=tianzy
i=adilger

don't print message on the console when ->adjust_qunit fails.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 61d630a..87e1806 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -93,6 +93,11 @@ Bugzilla   : 20550
 Description: missing tree_status on 1.8.1 RPM build
 Details    : make rpms failed due because the tree_status file is missing.
 
+Severity   : normal
+Bugzilla   : 19551
+Description: continuing LustreError "mds adjust qunit failed!"
+Details    : don't print message on the console when ->adjust_qunit fails.
+
 
 -------------------------------------------------------------------------------
 

diff --git a/lustre/quota/quota_master.c b/lustre/quota/quota_master.c
index 24e8131..84b60ee 100644 (file)
--- a/lustre/quota/quota_master.c
+++ b/lustre/quota/quota_master.c
@@ -505,7 +505,7 @@ int mds_quota_adjust(struct obd_device *obd, unsigned int qcids[],
         }
 
         if (rc2)
-                CDEBUG(rc2 == QUOTA_REQ_RETURNED ? D_QUOTA: D_ERROR,
+                CDEBUG(D_QUOTA,
                        "mds adjust qunit %ssuccessfully! (opc:%d rc:%d)\n",
                        rc2 == QUOTA_REQ_RETURNED ? "" : "un", opc, rc2);
         RETURN(0);
@@ -544,9 +544,9 @@ int filter_quota_adjust(struct obd_device *obd, unsigned int qcids[],
         if (rc || rc2) {
                 if (!rc)
                         rc = rc2;
-                CDEBUG(rc == QUOTA_REQ_RETURNED ? D_QUOTA: D_ERROR,
+                CDEBUG(D_QUOTA,
                        "filter adjust qunit %ssuccessfully! (opc:%d rc%d)\n",
-                       QUOTA_REQ_RETURNED ? "" : "un", opc, rc);
+                       rc == QUOTA_REQ_RETURNED ? "" : "un", opc, rc);
         }
 
         RETURN(0);