X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fquota%2Flquota_internal.h;h=8332525f82acf6023f3a9ac3ae6bf70623b4ca74;hp=19a08cbaa8d8897229fbada6391666bfdc3639bf;hb=ccabce23bd9e366c345c852f565766a799f61238;hpb=a00a07567d4909251e58900a9e5ea27157960fd4

diff --git a/lustre/quota/lquota_internal.h b/lustre/quota/lquota_internal.h
index 19a08cb..8332525 100644
--- a/lustre/quota/lquota_internal.h
+++ b/lustre/quota/lquota_internal.h
@@ -21,7 +21,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012, 2014, Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.
  * Use is subject to license terms.
  */
 
@@ -31,19 +31,6 @@
 #ifndef _LQUOTA_INTERNAL_H
 #define _LQUOTA_INTERNAL_H
 
-/*
-static inline char *qtype_name(int qtype)
-{
-	switch (qtype) {
-	case USRQUOTA:
-		return "usr";
-	case GRPQUOTA:
-		return "grp";
-	}
-	return "unknown";
-}
-*/
-
 #define RES_NAME(res) ((res) == LQUOTA_RES_MD ? "md" : "dt")
 
 #define QIF_IFLAGS (QIF_INODES | QIF_ITIME | QIF_ILIMITS)
@@ -58,6 +45,7 @@ static inline char *qtype_name(int qtype)
 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,
 };
@@ -69,9 +57,11 @@ static inline __u32 qtype2slv_oid(int qtype)
 		return LQUOTA_USR_OID;
 	case GRPQUOTA:
 		return LQUOTA_GRP_OID;
+	case PRJQUOTA:
+		return LQUOTA_PRJ_OID;
 	}
 
-	LASSERTF(0, "invalid quota type: %d", qtype);
+	/* should not come here, just make compile happy */
 	return LQUOTA_USR_OID;
 }
 
@@ -106,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 */
@@ -147,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
@@ -311,9 +301,11 @@ static inline int lquota_over_fl(int qtype)
 		return QUOTA_FL_OVER_USRQUOTA;
 	case GRPQUOTA:
 		return QUOTA_FL_OVER_GRPQUOTA;
+	case PRJQUOTA:
+		return QUOTA_FL_OVER_PRJQUOTA;
 	}
 
-	LASSERTF(0, "invalid quota type: %d", qtype);
+	/* should not come here, just make compile happy */
 	return QUOTA_FL_OVER_USRQUOTA;
 }