* GPL HEADER END
*/
/*
- * Copyright (c) 2012, 2014, Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.
* Use is subject to license terms.
*
* Author: Johann Lombardi <johann.lombardi@intel.com>
struct obd_uuid *uuid;
struct lquota_lvb *lvb;
struct ldlm_resource *res = (*lockp)->l_resource;
+ struct ldlm_reply *ldlm_rep;
int rc, lvb_len;
ENTRY;
if (repbody == NULL)
RETURN(err_serious(-EFAULT));
+ ldlm_rep = req_capsule_server_get(&req->rq_pill, &RMF_DLM_REP);
+ if (ldlm_rep == NULL)
+ RETURN(err_serious(-EFAULT));
+
uuid = &(*lockp)->l_export->exp_client_uuid;
switch (it->opc) {
break;
default:
- CERROR("%s: invalid intent opcode: "LPU64"\n", qmt->qmt_svname,
+ CERROR("%s: invalid intent opcode: %llu\n", qmt->qmt_svname,
it->opc);
- GOTO(out, rc = err_serious(-EINVAL));
+ GOTO(out, rc = -EINVAL);
}
/* on success, pack lvb in reply */
lvb = req_capsule_server_get(&req->rq_pill, &RMF_DLM_LVB);
lvb_len = ldlm_lvbo_size(*lockp);
- lvb_len = ldlm_lvbo_fill(*lockp, lvb, lvb_len);
+ lvb_len = ldlm_lvbo_fill(env, *lockp, lvb, &lvb_len);
if (lvb_len < 0)
GOTO(out, rc = lvb_len);
req_capsule_shrink(&req->rq_pill, &RMF_DLM_LVB, lvb_len, RCL_SERVER);
- EXIT;
out:
- return rc;
+ ldlm_rep->lock_policy_res2 = clear_serious(rc);
+ EXIT;
+ return ELDLM_OK;
}
/*
if (IS_ERR(obj))
GOTO(out, rc = PTR_ERR(obj));
if (!dt_object_exists(obj)) {
- lu_object_put(env, &obj->do_lu);
+ dt_object_put(env, obj);
GOTO(out, rc = -ENOENT);
}
LASSERT(lqe != NULL);
lqe_getref(lqe);
- LQUOTA_DEBUG(lqe, "releasing:"LPU64" may release:"LPU64,
+ LQUOTA_DEBUG(lqe, "releasing:%llu may release:%llu",
lvb->lvb_id_rel, lvb->lvb_id_may_rel);
if (lvb->lvb_id_rel == 0) {
QUOTA_DQACQ_FL_REL, lvb->lvb_id_rel, 0, &qti->qti_body);
if (rc || qti->qti_body.qb_count != lvb->lvb_id_rel)
LQUOTA_ERROR(lqe, "failed to release quota space on glimpse "
- LPU64"!="LPU64" rc:%d\n", qti->qti_body.qb_count,
+ "%llu!=%llu : rc = %d\n", qti->qti_body.qb_count,
lvb->lvb_id_rel, rc);
class_export_put(exp);
if (rc)
}
/* release object reference */
- lu_object_put(env, &obj->do_lu);
+ dt_object_put(env, obj);
lu_env_fini(env);
OBD_FREE_PTR(env);
}
RETURN(0);
}
-typedef int (*qmt_glimpse_cb_t)(const struct lu_env *, struct qmt_device *,
- struct obd_uuid *, union ldlm_gl_desc *,
- void *);
+typedef int (*qmt_glimpse_cb_t)(struct ldlm_lock *, void *);
+
+struct qmt_gl_lock_array {
+ unsigned long q_max;
+ unsigned long q_cnt;
+ struct ldlm_lock **q_locks;
+};
+
+static void qmt_free_lock_array(struct qmt_gl_lock_array *array)
+{
+ int i;
+
+ if (array->q_max == 0) {
+ LASSERT(array->q_locks == NULL);
+ return;
+ }
+
+ for (i = 0; i < array->q_cnt; i++) {
+ LASSERT(array->q_locks[i]);
+ LDLM_LOCK_RELEASE(array->q_locks[i]);
+ array->q_locks[i] = NULL;
+ }
+ array->q_cnt = 0;
+ OBD_FREE(array->q_locks, array->q_max * sizeof(*array->q_locks));
+ array->q_locks = NULL;
+ array->q_max = 0;
+}
+
+static int qmt_alloc_lock_array(struct ldlm_resource *res,
+ struct qmt_gl_lock_array *array,
+ qmt_glimpse_cb_t cb, void *arg)
+{
+ struct list_head *pos;
+ unsigned long count = 0;
+ int fail_cnt = 0;
+ ENTRY;
+
+ LASSERT(!array->q_max && !array->q_cnt && !array->q_locks);
+again:
+ lock_res(res);
+ /* scan list of granted locks */
+ list_for_each(pos, &res->lr_granted) {
+ struct ldlm_lock *lock;
+ int rc;
+
+ lock = list_entry(pos, struct ldlm_lock, l_res_link);
+ LASSERT(lock->l_export);
+
+ if (cb != NULL) {
+ rc = cb(lock, arg);
+ /* slave should not be notified */
+ if (rc == 0)
+ continue;
+ }
+
+ count++;
+ if (array->q_max != 0 && array->q_cnt < array->q_max) {
+ array->q_locks[array->q_cnt] = LDLM_LOCK_GET(lock);
+ array->q_cnt++;
+ }
+ }
+ unlock_res(res);
+
+ if (count > array->q_max) {
+ qmt_free_lock_array(array);
+ if (++fail_cnt > 5)
+ RETURN(-EAGAIN);
+ /*
+ * allocate more slots in case of more qualified locks are
+ * found during next loop
+ */
+ array->q_max = count + count / 2 + 10;
+ count = 0;
+ LASSERT(array->q_locks == NULL && array->q_cnt == 0);
+ OBD_ALLOC(array->q_locks,
+ sizeof(*array->q_locks) * array->q_max);
+ if (array->q_locks == NULL) {
+ array->q_max = 0;
+ RETURN(-ENOMEM);
+ }
+
+ goto again;
+ }
+ RETURN(0);
+}
+
/*
* Send glimpse callback to slaves holding a lock on resource \res.
* This is used to notify slaves of new quota settings or to claim quota space
{
struct list_head *tmp, *pos;
struct list_head gl_list = LIST_HEAD_INIT(gl_list);
- int rc = 0;
+ struct qmt_gl_lock_array locks;
+ unsigned long i;
+ int rc = 0;
ENTRY;
- lock_res(res);
- /* scan list of granted locks */
- list_for_each(pos, &res->lr_granted) {
- struct ldlm_glimpse_work *work;
- struct ldlm_lock *lock;
- struct obd_uuid *uuid;
-
- lock = list_entry(pos, struct ldlm_lock, l_res_link);
- LASSERT(lock->l_export);
- uuid = &lock->l_export->exp_client_uuid;
+ memset(&locks, 0, sizeof(locks));
+ rc = qmt_alloc_lock_array(res, &locks, cb, arg);
+ if (rc) {
+ CERROR("%s: failed to allocate glimpse lock array (%d)\n",
+ qmt->qmt_svname, rc);
+ RETURN(rc);
+ }
- if (cb != NULL) {
- rc = cb(env, qmt, uuid, desc, arg);
- if (rc == 0)
- /* slave should not be notified */
- continue;
- if (rc < 0)
- /* something wrong happened, we still notify */
- CERROR("%s: callback function failed to "
- "determine whether slave %s should be "
- "notified (%d)\n", qmt->qmt_svname,
- obd_uuid2str(uuid), rc);
- }
+ for (i = locks.q_cnt; i > 0; i--) {
+ struct ldlm_glimpse_work *work;
OBD_ALLOC_PTR(work);
if (work == NULL) {
- CERROR("%s: failed to notify %s\n", qmt->qmt_svname,
- obd_uuid2str(uuid));
+ CERROR("%s: failed to notify a lock.\n",
+ qmt->qmt_svname);
continue;
}
list_add_tail(&work->gl_list, &gl_list);
- work->gl_lock = LDLM_LOCK_GET(lock);
+ work->gl_lock = locks.q_locks[i - 1];
work->gl_flags = 0;
work->gl_desc = desc;
+ locks.q_locks[i - 1] = NULL;
+ locks.q_cnt--;
}
- unlock_res(res);
+
+ qmt_free_lock_array(&locks);
if (list_empty(&gl_list)) {
CDEBUG(D_QUOTA, "%s: nobody to notify\n", qmt->qmt_svname);
struct qmt_thread_info *qti = qmt_info(env);
struct qmt_pool_info *pool = lqe2qpi(lqe);
struct ldlm_resource *res = NULL;
- int rc;
ENTRY;
lquota_generate_fid(&qti->qti_fid, pool->qpi_key & 0x0000ffff,
/* send glimpse callback to notify slaves of new quota settings */
qti->qti_gl_desc.lquota_desc.gl_id = lqe->lqe_id;
qti->qti_gl_desc.lquota_desc.gl_flags = 0;
- qti->qti_gl_desc.lquota_desc.gl_hardlimit = lqe->lqe_hardlimit;
- qti->qti_gl_desc.lquota_desc.gl_softlimit = lqe->lqe_softlimit;
- qti->qti_gl_desc.lquota_desc.gl_time = lqe->lqe_gracetime;
+ if (lqe->lqe_is_default) {
+ qti->qti_gl_desc.lquota_desc.gl_hardlimit = 0;
+ qti->qti_gl_desc.lquota_desc.gl_softlimit = 0;
+ qti->qti_gl_desc.lquota_desc.gl_time = LQUOTA_GRACE_FLAG(0,
+ LQUOTA_FLAG_DEFAULT);
+
+ } else {
+ qti->qti_gl_desc.lquota_desc.gl_hardlimit = lqe->lqe_hardlimit;
+ qti->qti_gl_desc.lquota_desc.gl_softlimit = lqe->lqe_softlimit;
+ qti->qti_gl_desc.lquota_desc.gl_time = lqe->lqe_gracetime;
+ }
qti->qti_gl_desc.lquota_desc.gl_ver = ver;
/* look up ldlm resource associated with global index */
RETURN_EXIT;
}
- rc = qmt_glimpse_lock(env, pool->qpi_qmt, res, &qti->qti_gl_desc,
- NULL, NULL);
+ qmt_glimpse_lock(env, pool->qpi_qmt, res, &qti->qti_gl_desc,
+ NULL, NULL);
ldlm_resource_putref(res);
EXIT;
}
/* Callback function used to select locks that should be glimpsed when
* broadcasting the new qunit value */
-static int qmt_id_lock_cb(const struct lu_env *env, struct qmt_device *qmt,
- struct obd_uuid *uuid, union ldlm_gl_desc *desc,
- void *arg)
+static int qmt_id_lock_cb(struct ldlm_lock *lock, void *arg)
{
struct obd_uuid *slv_uuid = arg;
+ struct obd_uuid *uuid = &lock->l_export->exp_client_uuid;
if (slv_uuid != NULL && obd_uuid_equals(uuid, slv_uuid))
RETURN(0);
struct qmt_thread_info *qti = qmt_info(env);
struct qmt_pool_info *pool = lqe2qpi(lqe);
struct ldlm_resource *res = NULL;
- int rc;
ENTRY;
if (!lqe->lqe_enforced)
lqe_write_lock(lqe);
if (lqe->lqe_revoke_time == 0 &&
lqe->lqe_qunit == pool->qpi_least_qunit)
- lqe->lqe_revoke_time = cfs_time_current_64();
+ lqe->lqe_revoke_time = ktime_get_seconds();
lqe_write_unlock(lqe);
RETURN_EXIT;
}
lqe_write_unlock(lqe);
/* issue glimpse callback to slaves */
- rc = qmt_glimpse_lock(env, qmt, res, &qti->qti_gl_desc,
- uuid ? qmt_id_lock_cb : NULL, (void *)uuid);
+ qmt_glimpse_lock(env, qmt, res, &qti->qti_gl_desc,
+ uuid ? qmt_id_lock_cb : NULL, (void *)uuid);
lqe_write_lock(lqe);
if (lqe->lqe_revoke_time == 0 &&
qti->qti_gl_desc.lquota_desc.gl_qunit == pool->qpi_least_qunit &&
lqe->lqe_qunit == pool->qpi_least_qunit) {
- lqe->lqe_revoke_time = cfs_time_current_64();
- qmt_adjust_edquot(lqe, cfs_time_current_sec());
+ lqe->lqe_revoke_time = ktime_get_seconds();
+ qmt_adjust_edquot(lqe, ktime_get_real_seconds());
}
LASSERT(lqe->lqe_gl);
lqe->lqe_gl = false;
git://git.whamcloud.com / fs / lustre-release.git / blobdiff