X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fquota%2Flquota_entry.c;h=e94cd66d977802b9b694fcfd3063dc66478ff38a;hp=2e335d9902a37e2cf3ed9b1949bb06fa187daf85;hb=5c883ea2748ae9e430a9cd863a9b630b2a74440a;hpb=f6995cf04407dff15d6ca79ca44cfa97dc6eb014

diff --git a/lustre/quota/lquota_entry.c b/lustre/quota/lquota_entry.c
index 2e335d9..e94cd66 100644
--- a/lustre/quota/lquota_entry.c
+++ b/lustre/quota/lquota_entry.c
@@ -20,7 +20,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2015, Intel Corporation.
  * Use is subject to license terms.
  *
  * Author: Johann Lombardi <johann.lombardi@intel.com>
@@ -35,10 +35,11 @@
 #include "lquota_internal.h"
 
 static int hash_lqs_cur_bits = HASH_LQE_CUR_BITS;
-CFS_MODULE_PARM(hash_lqs_cur_bits, "i", int, 0444,
-                "the current bits of lqe hash");
+module_param(hash_lqs_cur_bits, int, 0444);
+MODULE_PARM_DESC(hash_lqs_cur_bits, "the current bits of lqe hash");
 
-static unsigned lqe64_hash_hash(cfs_hash_t *hs, const void *key, unsigned mask)
+static unsigned
+lqe64_hash_hash(struct cfs_hash *hs, const void *key, unsigned mask)
 {
 	return cfs_hash_u64_hash(*((__u64 *)key), mask);
 }
@@ -62,28 +63,28 @@ static void *lqe_hash_object(struct hlist_node *hnode)
 	return hlist_entry(hnode, struct lquota_entry, lqe_hash);
 }
 
-static void lqe_hash_get(cfs_hash_t *hs, struct hlist_node *hnode)
+static void lqe_hash_get(struct cfs_hash *hs, struct hlist_node *hnode)
 {
 	struct lquota_entry *lqe;
 	lqe = hlist_entry(hnode, struct lquota_entry, lqe_hash);
 	lqe_getref(lqe);
 }
 
-static void lqe_hash_put_locked(cfs_hash_t *hs, struct hlist_node *hnode)
+static void lqe_hash_put_locked(struct cfs_hash *hs, struct hlist_node *hnode)
 {
 	struct lquota_entry *lqe;
 	lqe = hlist_entry(hnode, struct lquota_entry, lqe_hash);
 	lqe_putref(lqe);
 }
 
-static void lqe_hash_exit(cfs_hash_t *hs, struct hlist_node *hnode)
+static void lqe_hash_exit(struct cfs_hash *hs, struct hlist_node *hnode)
 {
 	CERROR("Should not have any item left!\n");
 }
 
 /* lqe hash methods for 64-bit uid/gid, new hash functions would have to be
  * defined for per-directory quota relying on a 128-bit FID */
-static cfs_hash_ops_t lqe64_hash_ops = {
+static struct cfs_hash_ops lqe64_hash_ops = {
 	.hs_hash       = lqe64_hash_hash,
 	.hs_key        = lqe64_hash_key,
 	.hs_keycmp     = lqe64_hash_keycmp,
@@ -99,12 +100,15 @@ void lquota_lqe_debug0(struct lquota_entry *lqe,
 		       const char *fmt, ...)
 {
 	struct lquota_site *site = lqe->lqe_site;
+	struct va_format vaf;
 	va_list args;
 
 	LASSERT(site->lqs_ops->lqe_debug != NULL);
 
 	va_start(args, fmt);
-	site->lqs_ops->lqe_debug(lqe, site->lqs_parent, msgdata, fmt, args);
+	vaf.fmt = fmt;
+	vaf.va = &args;
+	site->lqs_ops->lqe_debug(lqe, site->lqs_parent, msgdata, &vaf);
 	va_end(args);
 }
 
@@ -114,7 +118,7 @@ struct lqe_iter_data {
 	bool		lid_free_all;
 };
 
-static int lqe_iter_cb(cfs_hash_t *hs, cfs_hash_bd_t *bd,
+static int lqe_iter_cb(struct cfs_hash *hs, struct cfs_hash_bd *bd,
 		       struct hlist_node *hnode, void *data)
 {
 	struct lqe_iter_data *d = (struct lqe_iter_data *)data;
@@ -151,7 +155,7 @@ static int lqe_iter_cb(cfs_hash_t *hs, cfs_hash_bd_t *bd,
  * \param free_all - free all entries or only free the entries
  *                   without quota enforce ?
  */
-static void lqe_cleanup(cfs_hash_t *hash, bool free_all)
+static void lqe_cleanup(struct cfs_hash *hash, bool free_all)
 {
 	struct lqe_iter_data	d;
 	int			repeat = 0;
@@ -172,8 +176,7 @@ retry:
 			"freed:%lu, repeat:%u\n", hash,
 			d.lid_inuse, d.lid_freed, repeat);
 		repeat++;
-		set_current_state(TASK_INTERRUPTIBLE);
-		schedule_timeout(cfs_time_seconds(1));
+		schedule_timeout_interruptible(cfs_time_seconds(1));
 		goto retry;
 	}
 	EXIT;
@@ -202,7 +205,8 @@ struct lquota_site *lquota_site_alloc(const struct lu_env *env, void *parent,
 	char			 hashname[15];
 	ENTRY;
 
-	LASSERT(qtype < MAXQUOTAS);
+	if (qtype >= LL_MAXQUOTAS)
+		RETURN(ERR_PTR(-ENOTSUPP));
 
 	OBD_ALLOC_PTR(site);
 	if (site == NULL)
@@ -216,14 +220,18 @@ struct lquota_site *lquota_site_alloc(const struct lu_env *env, void *parent,
 
 	/* allocate hash table */
 	memset(hashname, 0, sizeof(hashname));
-	sprintf(hashname, "LQUOTA_HASH%u", qtype);
+	snprintf(hashname, sizeof(hashname), "LQUOTA_HASH%hu", qtype);
 	site->lqs_hash= cfs_hash_create(hashname, hash_lqs_cur_bits,
 					HASH_LQE_MAX_BITS,
 					min(hash_lqs_cur_bits,
 					    HASH_LQE_BKT_BITS),
 					0, CFS_HASH_MIN_THETA,
 					CFS_HASH_MAX_THETA, &lqe64_hash_ops,
-					CFS_HASH_DEFAULT|CFS_HASH_BIGNAME);
+					CFS_HASH_RW_SEM_BKTLOCK |
+					CFS_HASH_COUNTER |
+					CFS_HASH_REHASH |
+					CFS_HASH_BIGNAME);
+
 	if (site->lqs_hash == NULL) {
 		OBD_FREE_PTR(site);
 		RETURN(ERR_PTR(-ENOMEM));
@@ -324,7 +332,7 @@ struct lquota_entry *lqe_locate(const struct lu_env *env,
 
 	OBD_SLAB_ALLOC_PTR_GFP(new, lqe_kmem, GFP_NOFS);
 	if (new == NULL) {
-		CERROR("Fail to allocate lqe for id:"LPU64", "
+		CERROR("Fail to allocate lqe for id:%llu, "
 			"hash:%s\n", qid->qid_uid, site->lqs_hash->hs_name);
 		RETURN(ERR_PTR(-ENOMEM));
 	}