* GPL HEADER END
*/
/*
- * Copyright (c) 2012, 2014, Intel Corporation.
+ * Copyright (c) 2012, 2016, Intel Corporation.
* Use is subject to license terms.
*
* Author: Johann Lombardi <johann.lombardi@intel.com>
strcat(enabled, "u");
if (qsd_type_enabled(qsd, GRPQUOTA))
strcat(enabled, "g");
+ if (qsd_type_enabled(qsd, PRJQUOTA))
+ strncat(enabled, "p", 1);
if (strlen(enabled) == 0)
strcat(enabled, "none");
strcat(enabled, "u");
if (qsd->qsd_type_array[GRPQUOTA]->qqi_acct_obj != NULL)
strcat(enabled, "g");
+ if (qsd->qsd_type_array[PRJQUOTA]->qqi_acct_obj != NULL)
+ strncat(enabled, "p", 1);
if (strlen(enabled) == 0)
strcat(enabled, "none");
seq_printf(m, "space acct: %s\n"
"user uptodate: glb[%d],slv[%d],reint[%d]\n"
- "group uptodate: glb[%d],slv[%d],reint[%d]\n",
+ "group uptodate: glb[%d],slv[%d],reint[%d]\n"
+ "project uptodate: glb[%d],slv[%d],reint[%d]\n",
enabled,
qsd->qsd_type_array[USRQUOTA]->qqi_glb_uptodate,
qsd->qsd_type_array[USRQUOTA]->qqi_slv_uptodate,
qsd->qsd_type_array[USRQUOTA]->qqi_reint,
qsd->qsd_type_array[GRPQUOTA]->qqi_glb_uptodate,
qsd->qsd_type_array[GRPQUOTA]->qqi_slv_uptodate,
- qsd->qsd_type_array[GRPQUOTA]->qqi_reint);
+ qsd->qsd_type_array[GRPQUOTA]->qqi_reint,
+ qsd->qsd_type_array[PRJQUOTA]->qqi_glb_uptodate,
+ qsd->qsd_type_array[PRJQUOTA]->qqi_slv_uptodate,
+ qsd->qsd_type_array[PRJQUOTA]->qqi_reint);
}
return 0;
}
strcat(enabled, "u");
if (qsd_type_enabled(qsd, GRPQUOTA))
strcat(enabled, "g");
+ if (qsd_type_enabled(qsd, PRJQUOTA))
+ strncat(enabled, "p", 1);
if (strlen(enabled) == 0)
strcat(enabled, "none");
rc = -EAGAIN;
} else {
/* mark all indexes as stale */
- for (qtype = USRQUOTA; qtype < MAXQUOTAS; qtype++) {
+ for (qtype = USRQUOTA; qtype < LL_MAXQUOTAS; qtype++) {
qsd->qsd_type_array[qtype]->qqi_glb_uptodate = false;
qsd->qsd_type_array[qtype]->qqi_slv_uptodate = false;
}
return rc;
/* kick off reintegration */
- for (qtype = USRQUOTA; qtype < MAXQUOTAS; qtype++) {
+ for (qtype = USRQUOTA; qtype < LL_MAXQUOTAS; qtype++) {
rc = qsd_start_reint_thread(qsd->qsd_type_array[qtype]);
if (rc)
break;
* reintegration procedure (i.e. global lock enqueue and slave
* index transfer) since the space usage reconciliation (i.e.
* step 3) will have to wait for qsd_start() to be called */
- for (type = USRQUOTA; type < MAXQUOTAS; type++) {
+ for (type = USRQUOTA; type < LL_MAXQUOTAS; type++) {
struct qsd_qtype_info *qqi = qsd->qsd_type_array[type];
wake_up(&qqi->qqi_reint_thread.t_ctl_waitq);
}
/* release accounting object */
if (qqi->qqi_acct_obj != NULL && !IS_ERR(qqi->qqi_acct_obj)) {
- lu_object_put(env, &qqi->qqi_acct_obj->do_lu);
+ dt_object_put(env, qqi->qqi_acct_obj);
qqi->qqi_acct_obj = NULL;
}
/* release slv index */
if (qqi->qqi_slv_obj != NULL && !IS_ERR(qqi->qqi_slv_obj)) {
- lu_object_put(env, &qqi->qqi_slv_obj->do_lu);
+ dt_object_put(env, qqi->qqi_slv_obj);
qqi->qqi_slv_obj = NULL;
qqi->qqi_slv_ver = 0;
}
/* release global index */
if (qqi->qqi_glb_obj != NULL && !IS_ERR(qqi->qqi_glb_obj)) {
- lu_object_put(env, &qqi->qqi_glb_obj->do_lu);
+ dt_object_put(env, qqi->qqi_glb_obj);
qqi->qqi_glb_obj = NULL;
qqi->qqi_glb_ver = 0;
}
EXIT;
}
+static const char *qtype2acct_name(int qtype)
+{
+ static char unknown[24];
+
+ switch (qtype) {
+ case USRQUOTA:
+ return "acct_user";
+ case GRPQUOTA:
+ return "acct_group";
+ case PRJQUOTA:
+ return "acct_project";
+ }
+
+ snprintf(unknown, sizeof(unknown), "acct_unknown_%u", qtype);
+ return unknown;
+}
+
+static const char *qtype2glb_name(int qtype)
+{
+ static char unknown[24];
+
+ switch (qtype) {
+ case USRQUOTA:
+ return "limit_user";
+ case GRPQUOTA:
+ return "limit_group";
+ case PRJQUOTA:
+ return "limit_project";
+ }
+
+ snprintf(unknown, sizeof(unknown), "acct_unknown_%u", qtype);
+ return unknown;
+}
+
/*
* Allocate and initialize a qsd_qtype_info structure for quota type \qtype.
* This opens the accounting object and initializes the proc file.
qqi->qqi_qsd = qsd;
qqi->qqi_qtype = qtype;
lu_ref_init(&qqi->qqi_reference);
- lquota_generate_fid(&qqi->qqi_fid, qsd->qsd_pool_id, QSD_RES_TYPE(qsd),
- qtype);
qqi->qqi_glb_uptodate = false;
qqi->qqi_slv_uptodate = false;
qqi->qqi_reint = false;
thread_set_flags(&qqi->qqi_reint_thread, SVC_STOPPED);
INIT_LIST_HEAD(&qqi->qqi_deferred_glb);
INIT_LIST_HEAD(&qqi->qqi_deferred_slv);
+ lquota_generate_fid(&qqi->qqi_fid, qsd->qsd_pool_id,
+ QSD_RES_TYPE(qsd), qtype);
/* open accounting object */
LASSERT(qqi->qqi_acct_obj == NULL);
qqi->qqi_acct_obj = acct_obj_lookup(env, qsd->qsd_dev, qtype);
if (IS_ERR(qqi->qqi_acct_obj)) {
- CDEBUG(D_QUOTA, "%s: no %s space accounting support rc:%ld\n",
- qsd->qsd_svname, QTYPE_NAME(qtype),
+ CDEBUG(D_QUOTA, "%s: no %s space accounting support: rc = %ld\n",
+ qsd->qsd_svname, qtype_name(qtype),
PTR_ERR(qqi->qqi_acct_obj));
qqi->qqi_acct_obj = NULL;
- qsd->qsd_acct_failed = true;
+ qqi->qqi_acct_failed = true;
}
/* open global index copy */
}
/* register proc entry for accounting & global index copy objects */
- rc = lprocfs_seq_create(qsd->qsd_proc,
- qtype == USRQUOTA ? "acct_user" : "acct_group",
+ rc = lprocfs_seq_create(qsd->qsd_proc, qtype2acct_name(qtype),
0444, &lprocfs_quota_seq_fops,
qqi->qqi_acct_obj);
if (rc) {
GOTO(out, rc);
}
- rc = lprocfs_seq_create(qsd->qsd_proc,
- qtype == USRQUOTA ? "limit_user" : "limit_group",
+ rc = lprocfs_seq_create(qsd->qsd_proc, qtype2glb_name(qtype),
0444, &lprocfs_quota_seq_fops,
qqi->qqi_glb_obj);
if (rc) {
qsd_stop_upd_thread(qsd);
/* shutdown the reintegration threads */
- for (qtype = USRQUOTA; qtype < MAXQUOTAS; qtype++) {
+ for (qtype = USRQUOTA; qtype < LL_MAXQUOTAS; qtype++) {
if (qsd->qsd_type_array[qtype] == NULL)
continue;
qsd_stop_reint_thread(qsd->qsd_type_array[qtype]);
}
/* free per-quota type data */
- for (qtype = USRQUOTA; qtype < MAXQUOTAS; qtype++)
+ for (qtype = USRQUOTA; qtype < LL_MAXQUOTAS; qtype++)
qsd_qtype_fini(env, qsd, qtype);
- /* deregister connection to the quota master */
- qsd->qsd_exp_valid = false;
- lustre_deregister_lwp_item(&qsd->qsd_exp);
+ if (qsd->qsd_exp) {
+ /* deregister connection to the quota master */
+ qsd->qsd_exp_valid = false;
+ lustre_deregister_lwp_item(&qsd->qsd_exp);
+ }
/* release per-filesystem information */
if (qsd->qsd_fsinfo != NULL) {
/* release quota root directory */
if (qsd->qsd_root != NULL) {
- lu_object_put(env, &qsd->qsd_root->do_lu);
+ dt_object_put(env, qsd->qsd_root);
qsd->qsd_root = NULL;
}
}
/* initialize per-quota type data */
- for (qtype = USRQUOTA; qtype < MAXQUOTAS; qtype++) {
+ for (qtype = USRQUOTA; qtype < LL_MAXQUOTAS; qtype++) {
rc = qsd_qtype_init(env, qsd, qtype);
if (rc)
RETURN(rc);
qsd->qsd_prepared = true;
write_unlock(&qsd->qsd_lock);
+ if (qsd->qsd_dev->dd_rdonly)
+ RETURN(0);
+
/* start reintegration thread for each type, if required */
- for (qtype = USRQUOTA; qtype < MAXQUOTAS; qtype++) {
+ for (qtype = USRQUOTA; qtype < LL_MAXQUOTAS; qtype++) {
struct qsd_qtype_info *qqi = qsd->qsd_type_array[qtype];
- if (qsd_type_enabled(qsd, qtype) && qsd->qsd_acct_failed) {
+ if (qsd_type_enabled(qsd, qtype) &&
+ qqi->qqi_acct_failed) {
LCONSOLE_ERROR("%s: can't enable quota enforcement "
"since space accounting isn't functional"
". Please run tunefs.lustre --quota on "
rc = qsd_start_reint_thread(qqi);
if (rc) {
- CERROR("%s: failed to start reint thread for type %s "
- "(%d)\n", qsd->qsd_svname, QTYPE_NAME(qtype),
- rc);
+ CERROR("%s: failed to start reint thread for type %s: rc = %d\n",
+ qsd->qsd_svname, qtype_name(qtype), rc);
RETURN(rc);
}
}
/* Trigger the 3rd step of reintegration: If usage > granted, acquire
* up to usage; If usage < granted, release down to usage. */
- for (type = USRQUOTA; type < MAXQUOTAS; type++) {
+ for (type = USRQUOTA; type < LL_MAXQUOTAS; type++) {
struct qsd_qtype_info *qqi = qsd->qsd_type_array[type];
wake_up(&qqi->qqi_reint_thread.t_ctl_waitq);
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff