LU-1346 libcfs: cleanup waitq related primitives

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

diff --git a/lustre/quota/lquota_internal.h b/lustre/quota/lquota_internal.h
index 29bdd1b..e80b25b 100644 (file)
--- a/lustre/quota/lquota_internal.h
+++ b/lustre/quota/lquota_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.
  */
 
@@ -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;
@@ -271,7 +271,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 +364,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 */