X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fquota%2Fqsd_handler.c;h=5bdb0cf2477638c13677ba1e068bf719eb31b611;hp=40c8cba85898965802333b17ed67a9431f4dae90;hb=54a792d389e7d21151031a63731567cb877f918c;hpb=f100d508311d16a09040a057438ee06fd9e6d7fe

diff --git a/lustre/quota/qsd_handler.c b/lustre/quota/qsd_handler.c
index 40c8cba..5bdb0cf 100644
--- a/lustre/quota/qsd_handler.c
+++ b/lustre/quota/qsd_handler.c
@@ -158,7 +158,7 @@ static void qsd_dqacq_completion(const struct lu_env *env,
 
 	lqe_write_lock(lqe);
 
-	LQUOTA_DEBUG(lqe, "DQACQ returned %d, flags:%x", ret,
+	LQUOTA_DEBUG(lqe, "DQACQ returned %d, flags:0x%x", ret,
 		     reqbody->qb_flags);
 
 	/* despite -EDQUOT & -EINPROGRESS errors, the master might still
@@ -167,8 +167,8 @@ static void qsd_dqacq_completion(const struct lu_env *env,
 		if (ret != -ETIMEDOUT && ret != -ENOTCONN &&
 		   ret != -ESHUTDOWN && ret != -EAGAIN)
 			/* print errors only if return code is unexpected */
-			LQUOTA_ERROR(lqe, "DQACQ failed with %d, flags:%x", ret,
-				     reqbody->qb_flags);
+			LQUOTA_ERROR(lqe, "DQACQ failed with %d, flags:0x%x",
+				     ret, reqbody->qb_flags);
 		GOTO(out, ret);
 	}
 
@@ -388,7 +388,7 @@ again:
 		}
 
 		if (!lqe->lqe_edquot && !lqe->lqe_nopreacq &&
-		    lustre_handle_is_used(&lqe->lqe_lockh) &&
+		    lustre_handle_is_used(&lqe->lqe_lockh) && usage > 0 &&
 		    lqe->lqe_qunit != 0 && granted < usage + lqe->lqe_qtune) {
 			/* To pre-acquire quota space, we report how much spare
 			 * quota space the slave currently owns, then the master