LU-1346 libcfs: remove cfs_ file wrappers

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

diff --git a/lustre/quota/qsd_reint.c b/lustre/quota/qsd_reint.c
index aa317fb..ad2894f 100644 (file)
--- a/lustre/quota/qsd_reint.c
+++ b/lustre/quota/qsd_reint.c
@@ -21,7 +21,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2011, 2012, Intel, Inc.
+ * Copyright (c) 2012, Intel Corporation.
  * Use is subject to license terms.
  *
  * Author: Johann Lombardi <johann.lombardi@intel.com>
@@ -197,7 +197,7 @@ static int qsd_reint_index(const struct lu_env *env, struct qsd_qtype_info *qqi,
        fid = global ? &qqi->qqi_fid : &qqi->qqi_slv_fid;
 
        /* let's do a 1MB bulk */
-       npages = min_t(unsigned int, PTLRPC_MAX_BRW_SIZE, 1 << 20);
+       npages = min_t(unsigned int, OFD_MAX_BRW_SIZE, 1 << 20);
        npages /= CFS_PAGE_SIZE;
 
        /* allocate pages for bulk index read */
@@ -636,6 +636,10 @@ int qsd_start_reint_thread(struct qsd_qtype_info *qqi)
        if (!qsd_type_enabled(qqi->qqi_qsd, qqi->qqi_qtype))
                RETURN(0);
 
+       if (qqi->qqi_qsd->qsd_acct_failed)
+               /* no space accounting support, can't enable enforcement */
+               RETURN(0);
+
        /* check if the reintegration has already started or finished */
        write_lock(&qsd->qsd_lock);