b=16890 a build fix for --disable-quota

[fs/lustre-release.git] / lustre / include / lustre_quota.h

diff --git a/lustre/include/lustre_quota.h b/lustre/include/lustre_quota.h
index 5582637..82071a3 100644 (file)
--- a/lustre/include/lustre_quota.h
+++ b/lustre/include/lustre_quota.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -37,6 +37,11 @@
 #ifndef _LUSTRE_QUOTA_H
 #define _LUSTRE_QUOTA_H
 
+/** \defgroup quota quota
+ *
+ * @{
+ */
+
 #if defined(__linux__)
 #include <linux/lustre_quota.h>
 #elif defined(__APPLE__)
@@ -174,9 +179,9 @@ struct lustre_mem_dqblk {
 
 struct lustre_dquot {
         /** Hash list in memory, protect by dquot_hash_lock */
-        struct list_head dq_hash;
+        cfs_list_t dq_hash;
         /** Protect the data in lustre_dquot */
-        struct semaphore dq_sem;
+        cfs_semaphore_t dq_sem;
         /** Use count */
         int dq_refcnt;
         /** Pointer of quota info it belongs to */
@@ -196,7 +201,7 @@ struct lustre_dquot {
 };
 
 struct dquot_id {
-        struct list_head        di_link;
+        cfs_list_t              di_link;
         __u32                   di_id;
         __u32                   di_flag;
 };
@@ -221,7 +226,7 @@ int lustre_read_dquot(struct lustre_dquot *dquot);
 int lustre_commit_dquot(struct lustre_dquot *dquot);
 int lustre_init_quota_info(struct lustre_quota_info *lqi, int type);
 int lustre_get_qids(struct file *file, struct inode *inode, int type,
-                    struct list_head *list);
+                    cfs_list_t *list);
 int lustre_quota_convert(struct lustre_quota_info *lqi, int type);
 
 typedef int (*dqacq_handler_t) (struct obd_device * obd, struct qunit_data * qd,
@@ -264,16 +269,12 @@ struct lustre_quota_ctxt {
                                          * 0:Off, 1:On
                                          */
                       lqc_valid:1,      /** this qctxt is valid or not */
-                      lqc_setup:1,      /**
+                      lqc_setup:1;      /**
                                          * tell whether of not quota_type has
                                          * been processed, so that the master
                                          * knows when it can start processing
                                          * incoming acq/rel quota requests
                                          */
-                      lqc_immutable:1;  /**
-                                         * cannot be turned on/off on-fly;
-                                         * temporary used by SOM.
-                                         */
         /** }@ */
         /**
          * original unit size of file quota and
@@ -330,7 +331,7 @@ struct lustre_quota_ctxt {
          */
         int           lqc_sync_blk;
         /** guard lqc_imp_valid now */
-        spinlock_t    lqc_lock;
+        cfs_spinlock_t lqc_lock;
         /**
          * when mds isn't connected, threads
          * on osts who send the quota reqs
@@ -341,7 +342,7 @@ struct lustre_quota_ctxt {
         /** lquota statistics */
         struct lprocfs_stats  *lqc_stats;
         /** the number of used hashed lqs */
-        atomic_t      lqc_lqs;
+        cfs_atomic_t  lqc_lqs;
         /** no lqs are in use */
         cfs_waitq_t   lqc_lqs_waitq;
 };
@@ -350,7 +351,7 @@ struct lustre_quota_ctxt {
 #define QUOTA_MASTER_UNREADY(qctxt) (qctxt)->lqc_setup = 0
 
 struct lustre_qunit_size {
-        struct hlist_node lqs_hash; /** the hash entry */
+        cfs_hlist_node_t lqs_hash; /** the hash entry */
         unsigned int lqs_id;        /** id of user/group */
         unsigned long lqs_flags;    /** 31st bit is QB_SET, 30th bit is QI_SET
                                      * other bits are same as LQUOTA_FLAGS_*
@@ -372,10 +373,10 @@ struct lustre_qunit_size {
         long long lqs_ino_rec;
         /** when blocks are allocated/released, this value will record it */
         long long lqs_blk_rec;
-        atomic_t lqs_refcount;
+        cfs_atomic_t lqs_refcount;
         cfs_time_t lqs_last_bshrink;   /** time of last block shrink */
         cfs_time_t lqs_last_ishrink;   /** time of last inode shrink */
-        spinlock_t lqs_lock;
+        cfs_spinlock_t lqs_lock;
         unsigned long long lqs_key;    /** hash key */
         struct lustre_quota_ctxt *lqs_ctxt; /** quota ctxt */
 };
@@ -397,10 +398,10 @@ struct lustre_qunit_size {
 
 static inline void __lqs_getref(struct lustre_qunit_size *lqs)
 {
-        int count = atomic_inc_return(&lqs->lqs_refcount);
+        int count = cfs_atomic_inc_return(&lqs->lqs_refcount);
 
         if (count == 2) /* quota_create_lqs */
-                atomic_inc(&lqs->lqs_ctxt->lqc_lqs);
+                cfs_atomic_inc(&lqs->lqs_ctxt->lqc_lqs);
         CDEBUG(D_INFO, "lqs=%p refcount %d\n", lqs, count);
 }
 
@@ -411,13 +412,13 @@ static inline void lqs_getref(struct lustre_qunit_size *lqs)
 
 static inline void __lqs_putref(struct lustre_qunit_size *lqs)
 {
-        LASSERT(atomic_read(&lqs->lqs_refcount) > 0);
+        LASSERT(cfs_atomic_read(&lqs->lqs_refcount) > 0);
 
-        if (atomic_dec_return(&lqs->lqs_refcount) == 1)
-                if (atomic_dec_and_test(&lqs->lqs_ctxt->lqc_lqs))
+        if (cfs_atomic_dec_return(&lqs->lqs_refcount) == 1)
+                if (cfs_atomic_dec_and_test(&lqs->lqs_ctxt->lqc_lqs))
                         cfs_waitq_signal(&lqs->lqs_ctxt->lqc_lqs_waitq);
         CDEBUG(D_INFO, "lqs=%p refcount %d\n",
-               lqs, atomic_read(&lqs->lqs_refcount));
+               lqs, cfs_atomic_read(&lqs->lqs_refcount));
 }
 
 static inline void lqs_putref(struct lustre_qunit_size *lqs)
@@ -427,7 +428,7 @@ static inline void lqs_putref(struct lustre_qunit_size *lqs)
 
 static inline void lqs_initref(struct lustre_qunit_size *lqs)
 {
-        atomic_set(&lqs->lqs_refcount, 0);
+        cfs_atomic_set(&lqs->lqs_refcount, 0);
 }
 
 #else
@@ -445,7 +446,7 @@ struct lustre_quota_ctxt {
 
 #else
 
-#define LL_DQUOT_OFF(sb, remount) do {} while(0)
+#define LL_DQUOT_OFF(sb) do {} while(0)
 
 struct lustre_quota_info {
 };
@@ -464,7 +465,7 @@ struct quotacheck_thread_args {
         struct obd_device   *qta_obd;   /** obd device */
         struct obd_quotactl  qta_oqctl; /** obd_quotactl args */
         struct super_block  *qta_sb;    /** obd super block */
-        struct semaphore    *qta_sem;   /** obt_quotachecking */
+        cfs_semaphore_t     *qta_sem;   /** obt_quotachecking */
 };
 
 struct obd_trans_info;
@@ -819,4 +820,6 @@ extern quota_interface_t lmv_quota_interface;
         "admin_quotafile_v2.grp"        /** group admin quotafile */\
 }
 
+/** @} quota */
+
 #endif /* _LUSTRE_QUOTA_H */