From 453e1cee7b9d87951a1a935ab14bc6c200c85a92 Mon Sep 17 00:00:00 2001
From: tianzy <tianzy>
Date: Thu, 9 Aug 2007 06:18:03 +0000
Subject: [PATCH] Branch HEAD fix a bug in test_10 in sanity-quota.sh b=13170
i=green, wangdi
---
lustre/ChangeLog | 6 ++++++
lustre/quota/quota_context.c | 6 +++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 73fec6677f..efe2229b79 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -41,6 +41,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-08-10 Cluster File Systems, Inc. <info@clusterfs.com>
diff --git a/lustre/quota/quota_context.c b/lustre/quota/quota_context.c
index e932307617..595f5e4823 100644
--- a/lustre/quota/quota_context.c
+++ b/lustre/quota/quota_context.c
@@ -54,7 +54,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);
@@ -635,8 +636,7 @@ schedule_dqacq(struct obd_device *obd,
LASSERT(!should_translate_quota(qctxt->lqc_import) ||
qdata->qd_count <= MAX_QUOTA_COUNT32);
- if (should_translate_quota(qctxt->lqc_import) ||
- OBD_FAIL_CHECK(OBD_FAIL_QUOTA_QD_COUNT_32BIT))
+ if (should_translate_quota(qctxt->lqc_import))
{
struct qunit_data_old *reqdata_old, *tmp;
--
GitLab