LU-3963 libcfs: convert ptlrpc,quota plus others to linux atomics

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

diff --git a/lustre/quota/lquota_internal.h b/lustre/quota/lquota_internal.h
index de3e294..2a094ab 100644 (file)
--- a/lustre/quota/lquota_internal.h
+++ b/lustre/quota/lquota_internal.h
@@ -116,7 +116,7 @@ struct lquota_slv_entry {
        rwlock_t                lse_lock;
 
        /* waiter for pending request done */
-       cfs_waitq_t             lse_waiters;
+       wait_queue_head_t       lse_waiters;
 
        /* hint on current on-disk usage, in inodes or kbytes */
        __u64                   lse_usage;
@@ -129,6 +129,9 @@ struct lquota_slv_entry {
 
        /* when latest acquire RPC completed */
        __u64                   lse_acq_time;
+
+       /* when latest edquot set */
+       __u64                   lse_edquot_time;
 };
 
 /* In-memory entry for each enforced quota id
@@ -144,7 +147,7 @@ struct lquota_entry {
        struct lquota_site      *lqe_site;
 
        /* reference counter */
-       cfs_atomic_t             lqe_ref;
+       atomic_t                 lqe_ref;
 
        /* linked to list of lqes which:
         * - need quota space adjustment on slave
@@ -208,6 +211,7 @@ struct lquota_site {
 #define lqe_lockh              u.se.lse_lockh
 #define lqe_acq_rc             u.se.lse_acq_rc
 #define lqe_acq_time           u.se.lse_acq_time
+#define lqe_edquot_time                u.se.lse_edquot_time
 
 #define LQUOTA_BUMP_VER 0x1
 #define LQUOTA_SET_VER  0x2
@@ -216,7 +220,7 @@ struct lquota_site {
 static inline void lqe_getref(struct lquota_entry *lqe)
 {
        LASSERT(lqe != NULL);
-       cfs_atomic_inc(&lqe->lqe_ref);
+       atomic_inc(&lqe->lqe_ref);
 }
 
 static inline void lqe_putref(struct lquota_entry *lqe)
@@ -271,7 +275,7 @@ static inline void lqe_read_unlock(struct lquota_entry *lqe)
 
 /* minimum qunit size, 1K inode for metadata pool and 1MB for data pool */
 #define LQUOTA_LEAST_QUNIT(type) \
-       (type == LQUOTA_RES_MD ? (1 << 10) : toqb(PTLRPC_MAX_BRW_SIZE))
+       (type == LQUOTA_RES_MD ? (1 << 10) : toqb(OFD_MAX_BRW_SIZE))
 
 #define LQUOTA_OVER_FL(type) \
        (type == USRQUOTA ? QUOTA_FL_OVER_USRQUOTA : QUOTA_FL_OVER_GRPQUOTA)
@@ -364,7 +368,7 @@ struct dt_object *acct_obj_lookup(const struct lu_env *, struct dt_device *,
 void lquota_generate_fid(struct lu_fid *, int, int, int);
 int lquota_extract_fid(const struct lu_fid *, int *, int *, int *);
 const struct dt_index_features *glb_idx_feature(struct lu_fid *);
-extern cfs_mem_cache_t *lqe_kmem;
+extern struct kmem_cache *lqe_kmem;
 
 /* lquota_entry.c */
 /* site create/destroy */