X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fquota%2Flquota_internal.h;h=f7d30b33998501024d18c6c408ffe1b447c8a44a;hb=refs%2Fchanges%2F51%2F28751%2F5;hp=08b15edddb838868c473889665a5d7f2853c3c3b;hpb=c2c28f2aa5d65d889bf5d1a707fec82e8f852c86;p=fs%2Flustre-release.git

diff --git a/lustre/quota/lquota_internal.h b/lustre/quota/lquota_internal.h
index 08b15ed..f7d30b3 100644
--- a/lustre/quota/lquota_internal.h
+++ b/lustre/quota/lquota_internal.h
@@ -21,7 +21,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  * Use is subject to license terms.
  */
 
@@ -31,7 +31,6 @@
 #ifndef _LQUOTA_INTERNAL_H
 #define _LQUOTA_INTERNAL_H
 
-#define QTYPE_NAME(qtype) ((qtype) == USRQUOTA ? "usr" : "grp")
 #define RES_NAME(res) ((res) == LQUOTA_RES_MD ? "md" : "dt")
 
 #define QIF_IFLAGS (QIF_INODES | QIF_ITIME | QIF_ILIMITS)
@@ -46,10 +45,26 @@
 enum lquota_local_oid {
 	LQUOTA_USR_OID		= 1UL, /* slave index copy for user quota */
 	LQUOTA_GRP_OID		= 2UL, /* slave index copy for group quota */
+	LQUOTA_PRJ_OID		= 3UL, /* slave index copy for project quota */
 	/* all OIDs after this are allocated dynamically by the QMT */
 	LQUOTA_GENERATED_OID	= 4096UL,
 };
 
+static inline __u32 qtype2slv_oid(int qtype)
+{
+	switch (qtype) {
+	case USRQUOTA:
+		return LQUOTA_USR_OID;
+	case GRPQUOTA:
+		return LQUOTA_GRP_OID;
+	case PRJQUOTA:
+		return LQUOTA_PRJ_OID;
+	}
+
+	/* should not come here, just make compile happy */
+	return LQUOTA_USR_OID;
+}
+
 /*
  * lquota_entry support
  */
@@ -81,7 +96,7 @@ struct lquota_mst_entry {
 	__u64			lme_gracetime;
 
 	/* last time we glimpsed */
-	__u64			lme_revoke_time;
+	time64_t		lme_revoke_time;
 
 	/* r/w semaphore used to protect concurrent access to the quota
 	 * parameters which are stored on disk */
@@ -122,16 +137,16 @@ struct lquota_slv_entry {
 	__u64			lse_usage;
 
 	/* time to trigger quota adjust */
-	__u64			lse_adjust_time;
+	time64_t		lse_adjust_time;
 
 	/* return code of latest acquire RPC */
 	int			lse_acq_rc;
 
 	/* when latest acquire RPC completed */
-	__u64			lse_acq_time;
+	time64_t		lse_acq_time;
 
 	/* when latest edquot set */
-	__u64			lse_edquot_time;
+	time64_t		lse_edquot_time;
 };
 
 /* In-memory entry for each enforced quota id
@@ -175,7 +190,7 @@ struct lquota_entry {
  * present.  */
 struct lquota_site {
 	/* Hash table storing lquota_entry structures */
-	cfs_hash_t	*lqs_hash;
+	struct cfs_hash	*lqs_hash;
 
 	/* Quota type, either user or group. */
 	int		 lqs_qtype;
@@ -216,6 +231,8 @@ struct lquota_site {
 #define LQUOTA_BUMP_VER 0x1
 #define LQUOTA_SET_VER  0x2
 
+extern struct kmem_cache *lqe_kmem;
+
 /* helper routine to get/put reference on lquota_entry */
 static inline void lqe_getref(struct lquota_entry *lqe)
 {
@@ -228,7 +245,7 @@ static inline void lqe_putref(struct lquota_entry *lqe)
 	LASSERT(lqe != NULL);
 	LASSERT(atomic_read(&lqe->lqe_ref) > 0);
 	if (atomic_dec_and_test(&lqe->lqe_ref))
-		OBD_FREE_PTR(lqe);
+		OBD_SLAB_FREE_PTR(lqe, lqe_kmem);
 }
 
 static inline int lqe_is_master(struct lquota_entry *lqe)
@@ -277,8 +294,20 @@ static inline void lqe_read_unlock(struct lquota_entry *lqe)
 #define LQUOTA_LEAST_QUNIT(type) \
 	(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)
+static inline int lquota_over_fl(int qtype)
+{
+	switch (qtype) {
+	case USRQUOTA:
+		return QUOTA_FL_OVER_USRQUOTA;
+	case GRPQUOTA:
+		return QUOTA_FL_OVER_GRPQUOTA;
+	case PRJQUOTA:
+		return QUOTA_FL_OVER_PRJQUOTA;
+	}
+
+	/* should not come here, just make compile happy */
+	return QUOTA_FL_OVER_USRQUOTA;
+}
 
 /* Common data shared by quota-level handlers. This is allocated per-thread to
  * reduce stack consumption */
@@ -287,7 +316,6 @@ struct lquota_thread_info {
 	struct lu_buf		qti_lb;
 	struct lu_attr		qti_attr;
 	struct dt_object_format	qti_dof;
-	struct lustre_mdt_attrs	qti_lma;
 	struct lu_fid		qti_fid;
 	char			qti_buf[LQUOTA_NAME_MAX];
 };
@@ -337,7 +365,7 @@ void lquota_lqe_debug0(struct lquota_entry *lqe,
 	__attribute__ ((format (printf, 3, 4)));
 
 #define LQUOTA_DEBUG_LIMIT(mask, lqe, fmt, a...) do {                          \
-	static cfs_debug_limit_state_t _lquota_cdls;                           \
+	static struct cfs_debug_limit_state _lquota_cdls;		       \
 	LIBCFS_DEBUG_MSG_DATA_DECL(msgdata, mask, &_lquota_cdls);              \
 	lquota_lqe_debug(&msgdata, mask, &_lquota_cdls, lqe, "$$$ "fmt" ",     \
 			 ##a);                                                 \
@@ -368,7 +396,6 @@ 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 struct kmem_cache *lqe_kmem;
 
 /* lquota_entry.c */
 /* site create/destroy */
@@ -409,6 +436,8 @@ int lquota_disk_write(const struct lu_env *, struct thandle *,
 		      __u32, __u64 *);
 int lquota_disk_update_ver(const struct lu_env *, struct dt_device *,
 			   struct dt_object *, __u64);
+int lquota_disk_write_glb(const struct lu_env *, struct dt_object *, __u64,
+			  struct lquota_glb_rec *);
 
 /* qmt_dev.c */
 int qmt_glb_init(void);