X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fquota%2Fqsd_handler.c;h=b90ecc075ea447f4858ed0e3ae4a7475cd0ca6bf;hb=7a814e94e065551ab79e2ba75df9626e4940efc5;hp=627f8975eef5591d162fb41a236d4580454a0c8c;hpb=e089a515efae3391709b997be889ebe0f3306e9d;p=fs%2Flustre-release.git

diff --git a/lustre/quota/qsd_handler.c b/lustre/quota/qsd_handler.c
index 627f897..b90ecc0 100644
--- a/lustre/quota/qsd_handler.c
+++ b/lustre/quota/qsd_handler.c
@@ -21,7 +21,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  * Use is subject to license terms.
  *
  * Author: Johann Lombardi <johann.lombardi@intel.com>
@@ -45,7 +45,7 @@ static inline int qsd_request_enter(struct lquota_entry *lqe)
 	}
 
 	if (lqe->lqe_pending_rel != 0) {
-		LQUOTA_ERROR(lqe, "no request in flight with pending_rel="LPU64,
+		LQUOTA_ERROR(lqe, "no request in flight with pending_rel=%llu",
 			     lqe->lqe_pending_rel);
 		LBUG();
 	}
@@ -350,12 +350,12 @@ static void qsd_req_completion(const struct lu_env *env,
 	 * the DQACQ since the limit for this ID has been removed, so we
 	 * should not update quota entry & slave index copy neither. */
 	if (repbody != NULL && repbody->qb_count != 0) {
-		LQUOTA_DEBUG(lqe, "DQACQ qb_count:"LPU64, repbody->qb_count);
+		LQUOTA_DEBUG(lqe, "DQACQ qb_count:%llu", repbody->qb_count);
 
 		if (req_is_rel(reqbody->qb_flags)) {
 			if (lqe->lqe_granted < repbody->qb_count) {
 				LQUOTA_ERROR(lqe, "can't release more space "
-					     "than owned "LPU64"<"LPU64,
+					     "than owned %llu<%llu",
 					     lqe->lqe_granted,
 					     repbody->qb_count);
 				lqe->lqe_granted = 0;
@@ -385,13 +385,10 @@ static void qsd_req_completion(const struct lu_env *env,
 	}
 
 	/* extract information from lvb */
-	if (ret == 0 && lvb != 0) {
+	if (ret == 0 && lvb != NULL) {
 		if (lvb->lvb_id_qunit != 0)
 			qsd_set_qunit(lqe, lvb->lvb_id_qunit);
-		if (lvb->lvb_flags & LQUOTA_FL_EDQUOT)
-			lqe->lqe_edquot = true;
-		else
-			lqe->lqe_edquot = false;
+		qsd_set_edquot(lqe, !!(lvb->lvb_flags & LQUOTA_FL_EDQUOT));
 	} else if (repbody != NULL && repbody->qb_qunit != 0) {
 		qsd_set_qunit(lqe, repbody->qb_qunit);
 	}
@@ -461,9 +458,15 @@ static int qsd_acquire_local(struct lquota_entry *lqe, __u64 space)
 		lqe->lqe_pending_write += space;
 		lqe->lqe_waiting_write -= space;
 		rc = 0;
-	} else if (lqe->lqe_edquot) {
+	/* lqe_edquot flag is used to avoid flooding dqacq requests when
+	 * the user is over quota, however, the lqe_edquot could be stale
+	 * sometimes due to the race reply of dqacq vs. id lock glimpse
+	 * (see LU-4505), so we revalidate it every 5 seconds. */
+	} else if (lqe->lqe_edquot &&
+		   cfs_time_before_64(cfs_time_shift_64(-5),
+			   	      lqe->lqe_edquot_time)) {
 		rc = -EDQUOT;
-	} else {
+	}else {
 		rc = -EAGAIN;
 	}
 	lqe_write_unlock(lqe);
@@ -631,7 +634,7 @@ static bool qsd_acquire(const struct lu_env *env, struct lquota_entry *lqe,
 	ENTRY;
 
 	for (count = 0; rc == 0; count++) {
-		LQUOTA_DEBUG(lqe, "acquiring:"LPD64 " count=%d", space, count);
+		LQUOTA_DEBUG(lqe, "acquiring:%lld count=%d", space, count);
 
 		if (lqe2qqi(lqe)->qqi_qsd->qsd_stopping) {
 			rc = -EINPROGRESS;
@@ -719,7 +722,7 @@ static int qsd_op_begin0(const struct lu_env *env, struct qsd_qtype_info *qqi,
 		RETURN(0);
 	}
 
-	LQUOTA_DEBUG(lqe, "op_begin space:"LPD64, space);
+	LQUOTA_DEBUG(lqe, "op_begin space:%lld", space);
 
 	lqe_write_lock(lqe);
 	lqe->lqe_waiting_write += space;
@@ -851,7 +854,7 @@ int qsd_op_begin(const struct lu_env *env, struct qsd_instance *qsd,
 	    qsd->qsd_acct_failed)
 		RETURN(0);
 
-	LASSERTF(trans->lqt_id_cnt <= QUOTA_MAX_TRANSIDS, "id_cnt=%d",
+	LASSERTF(trans->lqt_id_cnt <= QUOTA_MAX_TRANSIDS, "id_cnt=%d\n",
 		 trans->lqt_id_cnt);
 	/* check whether we already allocated a slot for this id */
 	for (i = 0; i < trans->lqt_id_cnt; i++) {
@@ -1148,7 +1151,7 @@ void qsd_op_adjust(const struct lu_env *env, struct qsd_instance *qsd,
 
 	lqe = lqe_locate(env, qqi->qqi_site, qid);
 	if (IS_ERR(lqe)) {
-		CERROR("%s: fail to locate lqe for id:"LPU64", type:%d\n",
+		CERROR("%s: fail to locate lqe for id:%llu, type:%d\n",
 		       qsd->qsd_svname, qid->qid_uid, qtype);
 		RETURN_EXIT;
 	}