X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fquota%2Fqmt_entry.c;h=d3ed2545d0cc95063b583615a0e3d597d0607697;hb=2b7af478bdbf5c6701e0e49aefe34597bdee3126;hp=eebe9d9ab8f1c64d432f4cea0cbab3aa2b80c329;hpb=d10200a80770f0029d1d665af954187b9ad883df;p=fs%2Flustre-release.git

diff --git a/lustre/quota/qmt_entry.c b/lustre/quota/qmt_entry.c
index eebe9d9..d3ed254 100644
--- a/lustre/quota/qmt_entry.c
+++ b/lustre/quota/qmt_entry.c
@@ -46,6 +46,55 @@ static void qmt_lqe_init(struct lquota_entry *lqe, void *arg)
 	init_rwsem(&lqe->lqe_sem);
 }
 
+/* Apply the default quota setting to the specified quota entry
+ *
+ * \param env		- is the environment passed by the caller
+ * \param pool		- is the quota pool of the quota entry
+ * \param lqe		- is the lquota_entry object to apply default quota on
+ * \param create_record	- if true, an global quota record will be created and
+ *                        write to the disk.
+ *
+ * \retval 0		: success
+ * \retval -ve		: other appropriate errors
+ */
+int qmt_lqe_set_default(const struct lu_env *env, struct qmt_pool_info *pool,
+			struct lquota_entry *lqe, bool create_record)
+{
+	struct lquota_entry	*lqe_def;
+	int			rc = 0;
+
+	ENTRY;
+
+	if (lqe->lqe_id.qid_uid == 0)
+		RETURN(0);
+
+	lqe_def = pool->qpi_grace_lqe[lqe->lqe_site->lqs_qtype];
+
+	LQUOTA_DEBUG(lqe, "inherit default quota");
+
+	lqe->lqe_is_default = true;
+	lqe->lqe_hardlimit = lqe_def->lqe_hardlimit;
+	lqe->lqe_softlimit = lqe_def->lqe_softlimit;
+
+	if (create_record) {
+		lqe->lqe_uptodate = true;
+		rc = qmt_set_with_lqe(env, pool->qpi_qmt, lqe, 0, 0,
+				      LQUOTA_GRACE_FLAG(0, LQUOTA_FLAG_DEFAULT),
+				      QIF_TIMES, true, false);
+
+		if (rc != 0)
+			LQUOTA_ERROR(lqe, "failed to create the global quota"
+				     " record: %d", rc);
+	}
+
+	if (lqe->lqe_hardlimit == 0 && lqe->lqe_softlimit == 0)
+		lqe->lqe_enforced = false;
+	else
+		lqe->lqe_enforced = true;
+
+	RETURN(rc);
+}
+
 /*
  * Update a lquota entry. This is done by reading quota settings from the global
  * index. The lquota entry must be write locked.
@@ -70,22 +119,19 @@ static int qmt_lqe_read(const struct lu_env *env, struct lquota_entry *lqe,
 
 	switch (rc) {
 	case -ENOENT:
-		/* no such entry, assume quota isn't enforced for this user */
-		lqe->lqe_enforced = false;
+		qmt_lqe_set_default(env, pool, lqe, true);
 		break;
 	case 0:
 		/* copy quota settings from on-disk record */
 		lqe->lqe_granted   = qti->qti_glb_rec.qbr_granted;
 		lqe->lqe_hardlimit = qti->qti_glb_rec.qbr_hardlimit;
 		lqe->lqe_softlimit = qti->qti_glb_rec.qbr_softlimit;
-		lqe->lqe_gracetime = qti->qti_glb_rec.qbr_time;
-
-		if (lqe->lqe_hardlimit == 0 && lqe->lqe_softlimit == 0)
-			/* {hard,soft}limit=0 means no quota enforced */
-			lqe->lqe_enforced = false;
-		else
-			lqe->lqe_enforced  = true;
+		lqe->lqe_gracetime = LQUOTA_GRACE(qti->qti_glb_rec.qbr_time);
 
+		if (lqe->lqe_hardlimit == 0 && lqe->lqe_softlimit == 0 &&
+		    (LQUOTA_FLAG(qti->qti_glb_rec.qbr_time) &
+		     LQUOTA_FLAG_DEFAULT))
+			qmt_lqe_set_default(env, pool, lqe, false);
 		break;
 	default:
 		LQUOTA_ERROR(lqe, "failed to read quota entry from disk, rc:%d",
@@ -93,6 +139,13 @@ static int qmt_lqe_read(const struct lu_env *env, struct lquota_entry *lqe,
 		RETURN(rc);
 	}
 
+	if (lqe->lqe_id.qid_uid == 0 ||
+	    (lqe->lqe_hardlimit == 0 && lqe->lqe_softlimit == 0))
+		/* {hard,soft}limit=0 means no quota enforced */
+		lqe->lqe_enforced = false;
+	else
+		lqe->lqe_enforced  = true;
+
 	LQUOTA_DEBUG(lqe, "read");
 	RETURN(0);
 }
@@ -107,22 +160,21 @@ static int qmt_lqe_read(const struct lu_env *env, struct lquota_entry *lqe,
  */
 static void qmt_lqe_debug(struct lquota_entry *lqe, void *arg,
 			  struct libcfs_debug_msg_data *msgdata,
-			  const char *fmt, va_list args)
+			  struct va_format *vaf)
 {
 	struct qmt_pool_info	*pool = (struct qmt_pool_info *)arg;
 
-	libcfs_debug_vmsg2(msgdata, fmt, args,
-			   "qmt:%s pool:%d-%s id:%llu enforced:%d hard:%llu"
-			   " soft:%llu granted:%llu time:%llu qunit:"
-			   "%llu edquot:%d may_rel:%llu revoke:%llu\n",
-			   pool->qpi_qmt->qmt_svname,
-			   pool->qpi_key & 0x0000ffff,
-			   RES_NAME(pool->qpi_key >> 16),
-			   lqe->lqe_id.qid_uid, lqe->lqe_enforced,
-			   lqe->lqe_hardlimit, lqe->lqe_softlimit,
-			   lqe->lqe_granted, lqe->lqe_gracetime,
-			   lqe->lqe_qunit, lqe->lqe_edquot, lqe->lqe_may_rel,
-			   lqe->lqe_revoke_time);
+	libcfs_debug_msg(msgdata,
+			 "%pV qmt:%s pool:%s-%s id:%llu enforced:%d hard:%llu soft:%llu granted:%llu time:%llu qunit: %llu edquot:%d may_rel:%llu revoke:%lld default:%s\n",
+			 vaf, pool->qpi_qmt->qmt_svname,
+			 RES_NAME(pool->qpi_rtype),
+			 pool->qpi_name,
+			 lqe->lqe_id.qid_uid, lqe->lqe_enforced,
+			 lqe->lqe_hardlimit, lqe->lqe_softlimit,
+			 lqe->lqe_granted, lqe->lqe_gracetime,
+			 lqe->lqe_qunit, lqe->lqe_edquot, lqe->lqe_may_rel,
+			 lqe->lqe_revoke_time,
+			 lqe->lqe_is_default ? "yes" : "no");
 }
 
 /*
@@ -264,9 +316,15 @@ int qmt_glb_write(const struct lu_env *env, struct thandle *th,
 
 	/* fill global index with updated quota settings */
 	rec->qbr_granted   = lqe->lqe_granted;
-	rec->qbr_hardlimit = lqe->lqe_hardlimit;
-	rec->qbr_softlimit = lqe->lqe_softlimit;
-	rec->qbr_time      = lqe->lqe_gracetime;
+	if (lqe->lqe_is_default) {
+		rec->qbr_hardlimit = 0;
+		rec->qbr_softlimit = 0;
+		rec->qbr_time      = LQUOTA_GRACE_FLAG(0, LQUOTA_FLAG_DEFAULT);
+	} else {
+		rec->qbr_hardlimit = lqe->lqe_hardlimit;
+		rec->qbr_softlimit = lqe->lqe_softlimit;
+		rec->qbr_time      = lqe->lqe_gracetime;
+	}
 
 	/* write new quota settings */
 	rc = lquota_disk_write(env, th, LQE_GLB_OBJ(lqe), &lqe->lqe_id,
@@ -425,7 +483,9 @@ void qmt_adjust_edquot(struct lquota_entry *lqe, __u64 now)
 
 		/* See comment in qmt_adjust_qunit(). LU-4139 */
 		if (qmt_hard_exhausted(lqe) ||
-		    pool->qpi_key >> 16 != LQUOTA_RES_DT) {
+		    pool->qpi_rtype != LQUOTA_RES_DT) {
+			time64_t lapse;
+
 			/* we haven't reached the minimal qunit yet so there is
 			 * still hope that the rebalancing process might free
 			 * up some quota space */
@@ -437,10 +497,8 @@ void qmt_adjust_edquot(struct lquota_entry *lqe, __u64 now)
 				RETURN_EXIT;
 
 			/* Let's give more time to slave to release space */
-			if (lqe->lqe_may_rel != 0 &&
-			    cfs_time_before_64(cfs_time_shift_64(
-					    		-QMT_REBA_TIMEOUT),
-				    	       lqe->lqe_revoke_time))
+			lapse = ktime_get_seconds() - QMT_REBA_TIMEOUT;
+			if (lqe->lqe_may_rel != 0 && lqe->lqe_revoke_time > lapse)
 				RETURN_EXIT;
 		} else {
 			if (lqe->lqe_qunit > pool->qpi_soft_least_qunit)
@@ -485,7 +543,7 @@ static __u64 qmt_calc_softlimit(struct lquota_entry *lqe, bool *oversoft)
 	LASSERT(lqe->lqe_softlimit != 0);
 	*oversoft = false;
 	/* No need to do special tweaking for inode limit */
-	if (pool->qpi_key >> 16 != LQUOTA_RES_DT)
+	if (pool->qpi_rtype != LQUOTA_RES_DT)
 		return lqe->lqe_softlimit;
 
 	if (lqe->lqe_granted <= lqe->lqe_softlimit +
@@ -675,7 +733,7 @@ done:
 		qmt_id_lock_notify(pool->qpi_qmt, lqe);
 	else if (lqe->lqe_qunit == pool->qpi_least_qunit)
 		/* initial qunit value is the smallest one */
-		lqe->lqe_revoke_time = cfs_time_current_64();
+		lqe->lqe_revoke_time = ktime_get_seconds();
 	EXIT;
 }
 
@@ -690,6 +748,6 @@ void qmt_revalidate(const struct lu_env *env, struct lquota_entry *lqe)
 		 * were initialized */
 		qmt_adjust_qunit(env, lqe);
 		if (lqe->lqe_qunit != 0)
-			qmt_adjust_edquot(lqe, cfs_time_current_sec());
+			qmt_adjust_edquot(lqe, ktime_get_real_seconds());
 	}
 }