X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fquota%2Flquota_internal.h;h=5361b7d0a28a423b0c9a388878f93fb5803446da;hb=2e2c8d59cfdb6d7078f9627ca970920059fcf90f;hp=7fedd29981d6d2e67375309317fe1e5416e80351;hpb=294aa9cb666c48e02da1057c222fe5f206ce38fc;p=fs%2Flustre-release.git

diff --git a/lustre/quota/lquota_internal.h b/lustre/quota/lquota_internal.h
index 7fedd29..5361b7d 100644
--- a/lustre/quota/lquota_internal.h
+++ b/lustre/quota/lquota_internal.h
@@ -21,17 +21,32 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012 Whamcloud, Inc.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  * Use is subject to license terms.
  */
 
 #include <obd.h>
-#include <lquota.h>
+#include <lustre_quota.h>
 
 #ifndef _LQUOTA_INTERNAL_H
 #define _LQUOTA_INTERNAL_H
 
-#define QTYPE_NAME(qtype) ((qtype) == USRQUOTA ? "usr" : "grp")
+/*
+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)
@@ -46,10 +61,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;
+	}
+
+	LASSERTF(0, "invalid quota type: %d", qtype);
+	return LQUOTA_USR_OID;
+}
+
 /*
  * lquota_entry support
  */
@@ -81,11 +112,11 @@ 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 */
-	cfs_rw_semaphore_t	lme_sem;
+	struct rw_semaphore	lme_sem;
 
 	/* quota space that may be released after glimpse */
 	__u64			lme_may_rel;
@@ -113,23 +144,32 @@ struct lquota_slv_entry {
 	unsigned int		lse_pending_req;
 
 	/* rw spinlock protecting in-memory counters (i.e. lse_pending*) */
-	cfs_rwlock_t		lse_lock;
+	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;
 
 	/* 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 */
+	time64_t		lse_acq_time;
+
+	/* when latest edquot set */
+	time64_t		lse_edquot_time;
 };
 
 /* In-memory entry for each enforced quota id
  * A lquota_entry structure belong to a single lquota_site */
 struct lquota_entry {
 	/* link to site hash table */
-	cfs_hlist_node_t	 lqe_hash;
+	struct hlist_node	 lqe_hash;
 
 	/* quota identifier associated with this entry */
 	union lquota_id		 lqe_id;
@@ -138,12 +178,12 @@ struct lquota_entry {
 	struct lquota_site	*lqe_site;
 
 	/* reference counter */
-	cfs_atomic_t		 lqe_ref;
+	atomic_t		 lqe_ref;
 
 	/* linked to list of lqes which:
 	 * - need quota space adjustment on slave
 	 * - need glimpse to be sent on master */
-	cfs_list_t		 lqe_link;
+	struct list_head	 lqe_link;
 
 	/* current quota settings/usage of this ID */
 	__u64		lqe_granted; /* granted limit, inodes or kbytes */
@@ -166,7 +206,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;
@@ -200,21 +240,28 @@ struct lquota_site {
 #define lqe_usage		u.se.lse_usage
 #define lqe_adjust_time		u.se.lse_adjust_time
 #define lqe_lockh		u.se.lse_lockh
+#define lqe_acq_rc		u.se.lse_acq_rc
+#define lqe_acq_time		u.se.lse_acq_time
+#define lqe_edquot_time		u.se.lse_edquot_time
 
 #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)
 {
-	cfs_atomic_inc(&lqe->lqe_ref);
+	LASSERT(lqe != NULL);
+	atomic_inc(&lqe->lqe_ref);
 }
 
 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)
@@ -226,33 +273,33 @@ static inline int lqe_is_master(struct lquota_entry *lqe)
 static inline void lqe_write_lock(struct lquota_entry *lqe)
 {
 	if (lqe_is_master(lqe))
-		cfs_down_write(&lqe->lqe_sem);
+		down_write(&lqe->lqe_sem);
 	else
-		cfs_write_lock(&lqe->lqe_lock);
+		write_lock(&lqe->lqe_lock);
 }
 
 static inline void lqe_write_unlock(struct lquota_entry *lqe)
 {
 	if (lqe_is_master(lqe))
-		cfs_up_write(&lqe->lqe_sem);
+		up_write(&lqe->lqe_sem);
 	else
-		cfs_write_unlock(&lqe->lqe_lock);
+		write_unlock(&lqe->lqe_lock);
 }
 
 static inline void lqe_read_lock(struct lquota_entry *lqe)
 {
 	if (lqe_is_master(lqe))
-		cfs_down_read(&lqe->lqe_sem);
+		down_read(&lqe->lqe_sem);
 	else
-		cfs_read_lock(&lqe->lqe_lock);
+		read_lock(&lqe->lqe_lock);
 }
 
 static inline void lqe_read_unlock(struct lquota_entry *lqe)
 {
 	if (lqe_is_master(lqe))
-		cfs_up_read(&lqe->lqe_sem);
+		up_read(&lqe->lqe_sem);
 	else
-		cfs_read_unlock(&lqe->lqe_lock);
+		read_unlock(&lqe->lqe_lock);
 }
 
 /*
@@ -261,7 +308,22 @@ 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))
+
+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;
+	}
+
+	LASSERTF(0, "invalid quota type: %d", qtype);
+	return QUOTA_FL_OVER_USRQUOTA;
+}
 
 /* Common data shared by quota-level handlers. This is allocated per-thread to
  * reduce stack consumption */
@@ -270,7 +332,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];
 };
@@ -299,6 +360,11 @@ struct lquota_thread_info *lquota_info(const struct lu_env *env)
 	return info;
 }
 
+#define req_is_acq(flags)    ((flags & QUOTA_DQACQ_FL_ACQ) != 0)
+#define req_is_preacq(flags) ((flags & QUOTA_DQACQ_FL_PREACQ) != 0)
+#define req_is_rel(flags)    ((flags & QUOTA_DQACQ_FL_REL) != 0)
+#define req_has_rep(flags)   ((flags & QUOTA_DQACQ_FL_REPORT) != 0)
+
 /* debugging macros */
 #ifdef LIBCFS_DEBUG
 #define lquota_lqe_debug(msgdata, mask, cdls, lqe, fmt, a...) do {      \
@@ -315,7 +381,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);                                                 \
@@ -346,7 +412,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 cfs_mem_cache_t *lqe_kmem;
 
 /* lquota_entry.c */
 /* site create/destroy */
@@ -376,7 +441,8 @@ int lquota_disk_for_each_slv(const struct lu_env *, struct dt_object *,
 			     struct lu_fid *, lquota_disk_slv_cb_t, void *);
 struct dt_object *lquota_disk_slv_find(const struct lu_env *,
 				       struct dt_device *, struct dt_object *,
-				       struct lu_fid *, struct obd_uuid *);
+				       const struct lu_fid *,
+				       struct obd_uuid *);
 int lquota_disk_read(const struct lu_env *, struct dt_object *,
 		     union lquota_id *, struct dt_rec *);
 int lquota_disk_declare_write(const struct lu_env *, struct thandle *,
@@ -386,6 +452,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);