X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fquota%2Fqsd_entry.c;h=f4e26a02b87739869bbf143694568867780358c2;hb=aefd5a20842bde9daf8fc996751fa37ff497933d;hp=f66df72240d77120f8f84f4d22f5c7f16f43b8f6;hpb=318fd8d197ff607a032dac6ed9cb15922e44a53f;p=fs%2Flustre-release.git

diff --git a/lustre/quota/qsd_entry.c b/lustre/quota/qsd_entry.c
index f66df72..f4e26a0 100644
--- a/lustre/quota/qsd_entry.c
+++ b/lustre/quota/qsd_entry.c
@@ -21,17 +21,13 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2011, 2012, Intel, Inc.
+ * Copyright (c) 2012, Intel Corporation.
  * Use is subject to license terms.
  *
- * Author: Johann Lombardi <johann@whamcloud.com>
- * Author: Niu    Yawei    <niu@whamcloud.com>
+ * Author: Johann Lombardi <johann.lombardi@intel.com>
+ * Author: Niu    Yawei    <yawei.niu@intel.com>
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
-
 #define DEBUG_SUBSYSTEM S_LQUOTA
 
 #include "qsd_internal.h"
@@ -47,11 +43,11 @@ static void qsd_lqe_init(struct lquota_entry *lqe, void *arg)
 	LASSERT(!lqe_is_master(lqe));
 
 	/* initialize slave parameters */
-	cfs_rwlock_init(&lqe->lqe_lock);
+	rwlock_init(&lqe->lqe_lock);
 	memset(&lqe->lqe_lockh, 0, sizeof(lqe->lqe_lockh));
 	lqe->lqe_pending_write = 0;
 	lqe->lqe_pending_req   = 0;
-	cfs_waitq_init(&lqe->lqe_waiters);
+	init_waitqueue_head(&lqe->lqe_waiters);
 	lqe->lqe_usage    = 0;
 	lqe->lqe_nopreacq = false;
 }
@@ -313,14 +309,11 @@ out:
 int qsd_update_lqe(const struct lu_env *env, struct lquota_entry *lqe,
 		   bool global, void *rec)
 {
-	struct qsd_qtype_info *qqi;
 	ENTRY;
 
 	LASSERT(lqe != NULL);
 	LASSERT(!lqe_is_master(lqe));
 
-	qqi = lqe2qqi(lqe);
-
 	/* updating lqe is always serialized, no locking needed. */
 	if (global) {
 		struct lquota_glb_rec *glb_rec = (struct lquota_glb_rec *)rec;
@@ -330,7 +323,7 @@ int qsd_update_lqe(const struct lu_env *env, struct lquota_entry *lqe,
 				     glb_rec->qbr_softlimit) ? true : false;
 
 		LQUOTA_DEBUG(lqe, "updating global index hardlimit: "LPU64", "
-			     "softlimit: "LPU64"\n", glb_rec->qbr_hardlimit,
+			     "softlimit: "LPU64, glb_rec->qbr_hardlimit,
 			     glb_rec->qbr_softlimit);
 	} else {
 		struct lquota_slv_rec *slv_rec = (struct lquota_slv_rec *)rec;