X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fquota%2Fqsd_writeback.c;h=8352e5919f8888fb63585ac99f49042c61f57409;hb=d1b47781a3acd449473884f42e71ece2a7789670;hp=67e2d8fc62dd8cf3fff946866b81bac85070937d;hpb=f625f670afbe954030ff81f0f8522137d6cdd335;p=fs%2Flustre-release.git

diff --git a/lustre/quota/qsd_writeback.c b/lustre/quota/qsd_writeback.c
index 67e2d8f..8352e59 100644
--- a/lustre/quota/qsd_writeback.c
+++ b/lustre/quota/qsd_writeback.c
@@ -30,6 +30,7 @@
 
 #define DEBUG_SUBSYSTEM S_LQUOTA
 
+#include <linux/kthread.h>
 #include "qsd_internal.h"
 
 extern struct kmem_cache *upd_kmem;
@@ -122,7 +123,7 @@ static void qsd_add_deferred(struct qsd_instance *qsd, struct list_head *list,
 		if (upd->qur_ver == tmp->qur_ver) {
 			LASSERT(tmp->qur_lqe);
 			LQUOTA_ERROR(tmp->qur_lqe, "Found a conflict record "
-				     "with ver:"LPU64"", tmp->qur_ver);
+				     "with ver:%llu", tmp->qur_ver);
 			list_del_init(&tmp->qur_link);
 			qsd_upd_free(tmp);
 		} else if (upd->qur_ver < tmp->qur_ver) {
@@ -150,7 +151,7 @@ static void qsd_kickoff_deferred(struct qsd_qtype_info *qqi,
 			/* drop this update */
 			list_del_init(&upd->qur_link);
 			CDEBUG(D_QUOTA, "%s: skipping deferred update ver:"
-			       LPU64"/"LPU64", global:%d, qid:"LPU64"\n",
+			       "%llu/%llu, global:%d, qid:%llu\n",
 			       qqi->qqi_qsd->qsd_svname, upd->qur_ver, ver,
 			       upd->qur_global, upd->qur_qid.qid_uid);
 			qsd_upd_free(upd);
@@ -164,11 +165,11 @@ static void qsd_kickoff_deferred(struct qsd_qtype_info *qqi,
 		RETURN_EXIT;
 
 	CDEBUG(D_QUOTA, "%s: found deferred update record. "
-	       "version:"LPU64"/"LPU64", global:%d, qid:"LPU64"\n",
+	       "version:%llu/%llu, global:%d, qid:%llu\n",
 	       qqi->qqi_qsd->qsd_svname, upd->qur_ver, ver,
 	       upd->qur_global, upd->qur_qid.qid_uid);
 
-	LASSERTF(upd->qur_ver > ver, "lur_ver:"LPU64", cur_ver:"LPU64"\n",
+	LASSERTF(upd->qur_ver > ver, "lur_ver:%llu, cur_ver:%llu\n",
 		 upd->qur_ver, ver);
 
 	/* Kick off the deferred udpate */
@@ -222,7 +223,7 @@ void qsd_upd_schedule(struct qsd_qtype_info *qqi, struct lquota_entry *lqe,
 	__u64			 cur_ver;
 	ENTRY;
 
-	CDEBUG(D_QUOTA, "%s: schedule update. global:%s, version:"LPU64"\n",
+	CDEBUG(D_QUOTA, "%s: schedule update. global:%s, version:%llu\n",
 	       qsd->qsd_svname, global ? "true" : "false", ver);
 
 	upd = qsd_upd_alloc(qqi, lqe, qid, rec, ver, global);
@@ -247,11 +248,11 @@ void qsd_upd_schedule(struct qsd_qtype_info *qqi, struct lquota_entry *lqe,
 			/* legitimate race between glimpse AST and
 			 * reintegration */
 			CDEBUG(D_QUOTA, "%s: discarding glb update from glimpse"
-			       " ver:"LPU64" local ver:"LPU64"\n",
+			       " ver:%llu local ver:%llu\n",
 			       qsd->qsd_svname, ver, cur_ver);
 		else
-			CERROR("%s: discard slv update, ver:"LPU64" local ver:"
-			       LPU64"\n", qsd->qsd_svname, ver, cur_ver);
+			CERROR("%s: discard slv update, ver:%llu local ver:"
+			       "%llu\n", qsd->qsd_svname, ver, cur_ver);
 		qsd_upd_free(upd);
 	} else if ((ver == cur_ver + 1) && qqi->qqi_glb_uptodate &&
 		   qqi->qqi_slv_uptodate) {
@@ -389,7 +390,7 @@ static bool qsd_job_pending(struct qsd_instance *qsd, struct list_head *upd,
 		return job_pending;
 	}
 
-	for (qtype = USRQUOTA; qtype < MAXQUOTAS; qtype++) {
+	for (qtype = USRQUOTA; qtype < LL_MAXQUOTAS; qtype++) {
 		struct qsd_qtype_info *qqi = qsd->qsd_type_array[qtype];
 
 		if (!qsd_type_enabled(qsd, qtype))
@@ -479,7 +480,7 @@ static int qsd_upd_thread(void *arg)
 		if (uptodate)
 			continue;
 
-		for (qtype = USRQUOTA; qtype < MAXQUOTAS; qtype++)
+		for (qtype = USRQUOTA; qtype < LL_MAXQUOTAS; qtype++)
 			qsd_start_reint_thread(qsd->qsd_type_array[qtype]);
 	}
 	lu_env_fini(env);
@@ -515,7 +516,7 @@ static void qsd_cleanup_deferred(struct qsd_instance *qsd)
 {
 	int	qtype;
 
-	for (qtype = USRQUOTA; qtype < MAXQUOTAS; qtype++) {
+	for (qtype = USRQUOTA; qtype < LL_MAXQUOTAS; qtype++) {
 		struct qsd_upd_rec	*upd, *tmp;
 		struct qsd_qtype_info	*qqi = qsd->qsd_type_array[qtype];
 
@@ -525,8 +526,8 @@ static void qsd_cleanup_deferred(struct qsd_instance *qsd)
 		write_lock(&qsd->qsd_lock);
 		list_for_each_entry_safe(upd, tmp, &qqi->qqi_deferred_glb,
 					 qur_link) {
-			CWARN("%s: Free global deferred upd: ID:"LPU64", "
-			      "ver:"LPU64"/"LPU64"\n", qsd->qsd_svname,
+			CWARN("%s: Free global deferred upd: ID:%llu, "
+			      "ver:%llu/%llu\n", qsd->qsd_svname,
 			      upd->qur_qid.qid_uid, upd->qur_ver,
 			      qqi->qqi_glb_ver);
 			list_del_init(&upd->qur_link);
@@ -534,8 +535,8 @@ static void qsd_cleanup_deferred(struct qsd_instance *qsd)
 		}
 		list_for_each_entry_safe(upd, tmp, &qqi->qqi_deferred_slv,
 					 qur_link) {
-			CWARN("%s: Free slave deferred upd: ID:"LPU64", "
-			      "ver:"LPU64"/"LPU64"\n", qsd->qsd_svname,
+			CWARN("%s: Free slave deferred upd: ID:%llu, "
+			      "ver:%llu/%llu\n", qsd->qsd_svname,
 			      upd->qur_qid.qid_uid, upd->qur_ver,
 			      qqi->qqi_slv_ver);
 			list_del_init(&upd->qur_link);