* 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>
struct qmt_pool_info *pool = (struct qmt_pool_info *)arg;
libcfs_debug_vmsg2(msgdata, fmt, args,
- "qmt:%s pool:%d-%s id:"LPU64" enforced:%d hard:"LPU64
- " soft:"LPU64" granted:"LPU64" time:"LPU64" qunit:"
- LPU64" edquot:%d may_rel:"LPU64" revoke:"LPU64"\n",
+ "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:%lld\n",
pool->qpi_qmt->qmt_svname,
pool->qpi_key & 0x0000ffff,
RES_NAME(pool->qpi_key >> 16),
RETURN(rc);
}
- LQUOTA_DEBUG(lqe, "successful slv read "LPU64, *granted);
+ LQUOTA_DEBUG(lqe, "successful slv read %llu", *granted);
RETURN(0);
}
LASSERT(lqe_is_master(lqe));
LASSERT(lqe_is_locked(lqe));
- LQUOTA_DEBUG(lqe, "write slv "DFID" granted:"LPU64,
+ LQUOTA_DEBUG(lqe, "write slv "DFID" granted:%llu",
PFID(lu_object_fid(&slv_obj->do_lu)), granted);
/* never delete the entry, otherwise, it'll not be transferred
(struct dt_rec *)rec, flags, ver);
if (rc) {
LQUOTA_ERROR(lqe, "failed to update slave index "DFID" granted:"
- LPU64, PFID(lu_object_fid(&slv_obj->do_lu)),
+ "%llu", PFID(lu_object_fid(&slv_obj->do_lu)),
granted);
RETURN(rc);
}
/* See comment in qmt_adjust_qunit(). LU-4139 */
if (qmt_hard_exhausted(lqe) ||
- pool->qpi_key >> 16 == LQUOTA_RES_MD) {
+ pool->qpi_key >> 16 != 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 */
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 {
- /* When exceeding softlimit, block qunit will be shrunk
- * to (4 * least_qunit) finally. */
- if (lqe->lqe_qunit > (pool->qpi_least_qunit << 2))
+ if (lqe->lqe_qunit > pool->qpi_soft_least_qunit)
RETURN_EXIT;
}
LASSERT(lqe->lqe_softlimit != 0);
*oversoft = false;
/* No need to do special tweaking for inode limit */
- if (pool->qpi_key >> 16 == LQUOTA_RES_MD)
+ if (pool->qpi_key >> 16 != LQUOTA_RES_DT)
return lqe->lqe_softlimit;
- /* Added (least_qunit * 4) as margin */
if (lqe->lqe_granted <= lqe->lqe_softlimit +
- (pool->qpi_least_qunit << 2)) {
+ pool->qpi_soft_least_qunit) {
return lqe->lqe_softlimit;
} else if (lqe->lqe_hardlimit != 0) {
*oversoft = true;
remaining = qmt_calc_softlimit(lqe, &oversoft);
if (remaining == 0)
remaining = lqe->lqe_granted +
- (pool->qpi_least_qunit << 2);
+ pool->qpi_soft_least_qunit;
} else {
remaining = lqe->lqe_hardlimit;
}
bool oversoft;
/* As a compromise of write performance and the grace time
* accuracy, the block qunit size will be shrunk to
- * (4 * least_qunit) when over softlimit. LU-4139. */
+ * qpi_soft_least_qunit when over softlimit. LU-4139. */
limit = qmt_calc_softlimit(lqe, &oversoft);
if (oversoft)
- qunit2 = pool->qpi_least_qunit << 2;
+ qunit2 = pool->qpi_soft_least_qunit;
if (limit == 0)
GOTO(done, qunit = qunit2);
} else if (lqe->lqe_hardlimit != 0) {
/* current qunit value still fits, let's see if we can afford to
* increase qunit now ...
* To increase qunit again, we have to be under 25% */
- while (limit >= lqe->lqe_granted + 6 * qunit * slv_cnt)
+ while (qunit && limit >= lqe->lqe_granted + 6 * qunit * slv_cnt)
qunit <<= 2;
+
+ if (!qunit) {
+ qunit = limit;
+ do_div(qunit, 2 * slv_cnt);
+ }
+
} else {
/* shrink qunit until we find a suitable value */
while (qunit > pool->qpi_least_qunit &&
/* keep current qunit */
RETURN_EXIT;
- LQUOTA_DEBUG(lqe, "%s qunit to "LPU64,
+ LQUOTA_DEBUG(lqe, "%s qunit to %llu",
lqe->lqe_qunit < qunit ? "increasing" : "decreasing",
qunit);
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;
}
* 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());
}
}