X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flvfs%2Flustre_quota_fmt.h;h=2146277d7790623ad1e26c9645ec583093ccb473;hb=8fd9914d125989b924fc6c0e1d50dfd193a73438;hp=d1aab0203876452a814d45a074c3bb230103a099;hpb=ff359e141b6cfc1a9c2c3f3765fabc136e3f9040;p=fs%2Flustre-release.git

diff --git a/lustre/lvfs/lustre_quota_fmt.h b/lustre/lvfs/lustre_quota_fmt.h
index d1aab02..2146277 100644
--- a/lustre/lvfs/lustre_quota_fmt.h
+++ b/lustre/lvfs/lustre_quota_fmt.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.
  */
 /*
@@ -81,8 +81,8 @@ struct lustre_disk_dqblk_v2 {
         __u64 dqb_bhardlimit;   /**< absolute limit on disk space (in QUOTABLOCK_SIZE) */
         __u64 dqb_bsoftlimit;   /**< preferred limit on disk space (in QUOTABLOCK_SIZE) */
         __u64 dqb_curspace;     /**< current space occupied (in bytes) */
-        __u64 dqb_btime;        /**< time limit for excessive disk use */
-        __u64 dqb_itime;        /**< time limit for excessive inode use */
+        obd_time dqb_btime;        /**< time limit for excessive disk use */
+        obd_time dqb_itime;        /**< time limit for excessive inode use */
 };
 
 /* Number of entries in one blocks(14 entries) */
@@ -143,10 +143,11 @@ typedef char *dqbuf_t;
 
 #define MAX_UL (0xffffffffUL)
 
-#define lustre_info_dirty(info) test_bit(DQF_INFO_DIRTY_B, &(info)->dqi_flags)
+#define lustre_info_dirty(info) \
+        cfs_test_bit(DQF_INFO_DIRTY_B, &(info)->dqi_flags)
 
 struct dqblk {
-        struct list_head link;
+        cfs_list_t link;
         uint blk;
 };
 
@@ -175,7 +176,7 @@ int insert_free_dqentry(struct file *filp,
 ssize_t quota_read(struct file *file, struct inode *inode, int type,
                    uint blk, dqbuf_t buf);
 int walk_tree_dqentry(struct file *filp, struct inode *inode, int type,
-                      uint blk, int depth, struct list_head *list);
+                      uint blk, int depth, cfs_list_t *list);
 int check_quota_file(struct file *f, struct inode *inode, int type,
                      lustre_quota_version_t version);
 int lustre_check_quota_file(struct lustre_quota_info *lqi, int type);
@@ -183,7 +184,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 *fp, struct inode *inode, int type,
-                    struct list_head *list);
+                    cfs_list_t *list);
 ssize_t lustre_read_quota(struct file *f, struct inode *inode, int type,
                           char *buf, int count, loff_t pos);