LU-4036 autoconf: don't check ext4 src when disable server

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

diff --git a/lustre/quota/qsd_internal.h b/lustre/quota/qsd_internal.h
index c640a69..a518f4a 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, 2013, Intel Corporation.
  * Use is subject to license terms.
  */
 
@@ -82,7 +82,7 @@ struct qsd_instance {
        cfs_list_t               qsd_adjust_list;
 
        /* lock protecting adjust list */
-       cfs_spinlock_t           qsd_adjust_lock;
+       spinlock_t               qsd_adjust_lock;
 
        /* dedicated thread for updating slave index files. */
        struct ptlrpc_thread     qsd_upd_thread;
@@ -95,7 +95,7 @@ struct qsd_instance {
         * - the qsd update list
         * - the deferred list
         * - flags of the qsd_qtype_info */
-       cfs_rwlock_t             qsd_lock;
+       rwlock_t                 qsd_lock;
 
        /* Default quota settings which apply to all identifiers */
        /* when blk qunit reaches this value, later write reqs from client
@@ -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 */
 };
 
 /*
@@ -190,7 +192,7 @@ struct qsd_fsinfo {
 
        /* list of all qsd_instance for this fs */
        cfs_list_t              qfs_qsd_list;
-       cfs_semaphore_t         qfs_sem;
+       struct semaphore        qfs_sem;
 
        /* link to the global quota fsinfo list.  */
        cfs_list_t              qfs_link;
@@ -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,16 +353,16 @@ 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 *);
+                   struct idx_info *, unsigned int, struct page **, bool *);
 
 /* qsd_writeback.c */
 void qsd_bump_version(struct qsd_qtype_info *, __u64, bool);