LU-2361 quota: allow upgraded fs to start w/o spc accounting

[fs/lustre-release.git] / lustre / quota / qsd_internal.h

diff --git a/lustre/quota/qsd_internal.h b/lustre/quota/qsd_internal.h
index 3f9f1e4..79908f2 100644 (file)
--- a/lustre/quota/qsd_internal.h
+++ b/lustre/quota/qsd_internal.h
@@ -21,7 +21,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012 Whamcloud, Inc.
+ * Copyright (c) 2012, Intel Corporation.
  * Use is subject to license terms.
  */
 
@@ -112,7 +112,9 @@ struct qsd_instance {
                                 qsd_prepared:1, /* qsd_prepare() successfully
                                                  * called */
                                 qsd_exp_valid:1,/* qsd_exp is now valid */
-                                qsd_stopping:1; /* qsd_instance is stopping */
+                                qsd_stopping:1, /* qsd_instance is stopping */
+                                qsd_acct_failed:1; /* failed to set up acct
+                                                    * for one quota type */
 };
 
 /*
@@ -245,7 +247,7 @@ struct qsd_thread_info {
        struct ldlm_enqueue_info        qti_einfo;
        struct lustre_handle            qti_lockh;
        __u64                           qti_slv_ver;
-       union ldlm_wire_lvb             qti_lvb;
+       struct lquota_lvb               qti_lvb;
        union {
                struct quota_body       qti_body;
                struct idx_info         qti_ii;
@@ -351,14 +353,14 @@ typedef void (*qsd_req_completion_t) (const struct lu_env *,
                                      struct qsd_qtype_info *,
                                      struct quota_body *, struct quota_body *,
                                      struct lustre_handle *,
-                                     union ldlm_wire_lvb *, void *, int);
+                                     struct lquota_lvb *, void *, int);
 int qsd_send_dqacq(const struct lu_env *, struct obd_export *,
                   struct quota_body *, bool, qsd_req_completion_t,
                   struct qsd_qtype_info *, struct lustre_handle *,
                   struct lquota_entry *);
 int qsd_intent_lock(const struct lu_env *, struct obd_export *,
                    struct quota_body *, bool, int, qsd_req_completion_t,
-                   struct qsd_qtype_info *, union ldlm_wire_lvb *, void *);
+                   struct qsd_qtype_info *, struct lquota_lvb *, void *);
 int qsd_fetch_index(const struct lu_env *, struct obd_export *,
                    struct idx_info *, unsigned int, cfs_page_t **, bool *);