Branch HEAD

[fs/lustre-release.git] / lustre / quota / quota_context.c

diff --git a/lustre/quota/quota_context.c b/lustre/quota/quota_context.c
index 3f03425..595f5e4 100644 (file)
--- 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);
         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);
                 RETURN(0);
         else
                 RETURN(1);


@@ -289,7 +290,7 @@ static struct lustre_qunit *alloc_qunit(struct lustre_quota_ctxt *qctxt,
         struct lustre_qunit *qunit = NULL;
         ENTRY;
 
         struct lustre_qunit *qunit = NULL;
         ENTRY;
 

-        OBD_SLAB_ALLOC(qunit, qunit_cachep, GFP_NOFS, sizeof(*qunit));
+        OBD_SLAB_ALLOC(qunit, qunit_cachep, CFS_ALLOC_IO, sizeof(*qunit));

         if (qunit == NULL)
                 RETURN(NULL);
 
         if (qunit == NULL)
                 RETURN(NULL);
 


@@ -635,8 +636,7 @@ schedule_dqacq(struct obd_device *obd,
 
         LASSERT(!should_translate_quota(qctxt->lqc_import) || 
                 qdata->qd_count <= MAX_QUOTA_COUNT32);
 
         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;
                         
         {
                 struct qunit_data_old *reqdata_old, *tmp;