Branch b1_6

fix a bug in test_10 in sanity-quota.sh
b=13170
i=green, wangdi

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index de5874a..e07edc9 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -135,6 +135,12 @@ Frequency  : Only for SLES9
 Description: Kernel patches for SLES9 2.6.5-7.286 kernel
 Details    : Update target/ChangeLog/which_patch .
 
+Severity   : normal
+Bugzilla   : 13170
+Frequency  : Only for test_10 in sanity-quota.sh
+Description: a bug in quota test code
+Details    : checking a test flag in a wrong place
+
 --------------------------------------------------------------------------------
 
 2007-07-30         Cluster File Systems, Inc. <info@clusterfs.com>

diff --git a/lustre/quota/quota_context.c b/lustre/quota/quota_context.c
index d2b6c2e..08ef0c5 100644 (file)
--- a/lustre/quota/quota_context.c
+++ b/lustre/quota/quota_context.c
@@ -55,7 +55,8 @@ int should_translate_quota (struct obd_import *imp)
         ENTRY;
 
         LASSERT(imp);
-        if (imp->imp_connect_data.ocd_connect_flags & OBD_CONNECT_QUOTA64)
+        if ((imp->imp_connect_data.ocd_connect_flags & OBD_CONNECT_QUOTA64) && 
+            !OBD_FAIL_CHECK(OBD_FAIL_QUOTA_QD_COUNT_32BIT))
                 RETURN(0);
         else
                 RETURN(1);
@@ -657,8 +658,7 @@ schedule_dqacq(struct obd_device *obd,
                  qdata->qd_count <= MAX_QUOTA_COUNT32,
                  "qd_count: "LPU64"; should_translate_quota: %d.\n",
                  qdata->qd_count, should_translate_quota(imp));
-        if (should_translate_quota(imp) ||
-            OBD_FAIL_CHECK(OBD_FAIL_QUOTA_QD_COUNT_32BIT))
+        if (should_translate_quota(imp))
         {
                 struct qunit_data_old *reqdata_old, *tmp;