X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fquota%2Fqsd_lock.c;h=c9996bc6e3013c25b4d2ce2a855b79b754a22636;hb=cffd726304667ea3d84b4b3c1a9b66565e5a5566;hp=d72d800a73416411e1097265e75715ac136be786;hpb=3f4ca2cb52dc9c88c8061d8b907b6f793d604f6c;p=fs%2Flustre-release.git

diff --git a/lustre/quota/qsd_lock.c b/lustre/quota/qsd_lock.c
index d72d800..c9996bc 100644
--- a/lustre/quota/qsd_lock.c
+++ b/lustre/quota/qsd_lock.c
@@ -21,7 +21,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2012, 2016, Intel Corporation.
  * Use is subject to license terms.
  *
  * Author: Johann Lombardi <johann.lombardi@intel.com>
@@ -252,13 +252,13 @@ static int qsd_glb_glimpse_ast(struct ldlm_lock *lock, void *data)
 		/* valid race */
 		GOTO(out, rc = -ELDLM_NO_LOCK_DATA);
 
-	CDEBUG(D_QUOTA, "%s: glimpse on glb quota locks, id:"LPU64" ver:"LPU64
-	       " hard:" LPU64" soft:"LPU64"\n", qqi->qqi_qsd->qsd_svname,
+	CDEBUG(D_QUOTA, "%s: glimpse on glb quota locks, id:%llu ver:%llu"
+	       " hard:" "%llu soft:%llu\n", qqi->qqi_qsd->qsd_svname,
 	       desc->gl_id.qid_uid, desc->gl_ver, desc->gl_hardlimit,
 	       desc->gl_softlimit);
 
 	if (desc->gl_ver == 0) {
-		CERROR("%s: invalid global index version "LPU64"\n",
+		CERROR("%s: invalid global index version %llu\n",
 		       qqi->qqi_qsd->qsd_svname, desc->gl_ver);
 		GOTO(out_qqi, rc = -EINVAL);
 	}
@@ -379,7 +379,6 @@ static int qsd_id_glimpse_ast(struct ldlm_lock *lock, void *data)
 {
 	struct ptlrpc_request		*req = data;
 	struct lquota_entry		*lqe;
-	struct qsd_instance             *qsd;
 	struct ldlm_gl_lquota_desc	*desc;
 	struct lquota_lvb		*lvb;
 	int				 rc;
@@ -395,11 +394,9 @@ static int qsd_id_glimpse_ast(struct ldlm_lock *lock, void *data)
 		/* valid race */
 		GOTO(out, rc = -ELDLM_NO_LOCK_DATA);
 
-	LQUOTA_DEBUG(lqe, "glimpse on quota locks, new qunit:"LPU64,
+	LQUOTA_DEBUG(lqe, "glimpse on quota locks, new qunit:%llu",
 		     desc->gl_qunit);
 
-	qsd = lqe2qqi(lqe)->qqi_qsd;
-
 	lqe_write_lock(lqe);
 	lvb->lvb_id_rel = 0;
 	if (desc->gl_qunit != 0 && desc->gl_qunit != lqe->lqe_qunit) {
@@ -416,13 +413,13 @@ static int qsd_id_glimpse_ast(struct ldlm_lock *lock, void *data)
 		if (space > 0) {
 			if (lqe->lqe_pending_req > 0) {
 				LQUOTA_DEBUG(lqe, "request in flight, postpone "
-					     "release of "LPD64, space);
+					     "release of %lld", space);
 				lvb->lvb_id_may_rel = space;
 			} else {
 				lqe->lqe_pending_req++;
 
 				/* release quota space in glimpse reply */
-				LQUOTA_DEBUG(lqe, "releasing "LPD64, space);
+				LQUOTA_DEBUG(lqe, "releasing %lld", space);
 				lqe->lqe_granted -= space;
 				lvb->lvb_id_rel   = space;