LU-11750 krb5: krb5int_derive_key has 'hash' extra parameter

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

diff --git a/lustre/quota/lquota_internal.h b/lustre/quota/lquota_internal.h
index b7fa192..ab1eab0 100644 (file)
--- 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,22 +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";
-       case PRJQUOTA:
-               return "prj";
-               break;
-       }
-       return "unknown";
-}
-*/
-
 #define RES_NAME(res) ((res) == LQUOTA_RES_MD ? "md" : "dt")
 
 #define QIF_IFLAGS (QIF_INODES | QIF_ITIME | QIF_ILIMITS)
@@ -77,7 +61,7 @@ static inline __u32 qtype2slv_oid(int qtype)
                return LQUOTA_PRJ_OID;
        }
 
-       LASSERTF(0, "invalid quota type: %d", qtype);
+       /* should not come here, just make compile happy */
        return LQUOTA_USR_OID;
 }
 
@@ -112,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 */
@@ -153,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
@@ -194,11 +178,12 @@ struct lquota_entry {
        } u;
 
        /* flags describing the state of the lquota_entry */
-       unsigned long   lqe_enforced:1,/* quota enforced or not */
-                       lqe_uptodate:1,/* successfully read from disk */
-                       lqe_edquot:1,  /* id out of quota space on QMT */
-                       lqe_gl:1,      /* glimpse is in progress */
-                       lqe_nopreacq:1;/* pre-acquire disabled */
+       unsigned long   lqe_enforced:1,   /* quota enforced or not */
+                       lqe_uptodate:1,   /* successfully read from disk */
+                       lqe_edquot:1,     /* id out of quota space on QMT */
+                       lqe_gl:1,         /* glimpse is in progress */
+                       lqe_nopreacq:1,   /* pre-acquire disabled */
+                       lqe_is_default:1; /* the default quota is used */
 };
 
 /* Compartment within which lquota_entry are unique.
@@ -321,7 +306,7 @@ static inline int lquota_over_fl(int qtype)
                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;
 }