{
struct mds_obd *mds = &obd->u.mds;
struct lustre_quota_ctxt *qctxt = &mds->mds_obt.obt_qctxt;
- struct obd_device *lov_mds_obd = class_exp2obd(mds->mds_osc_exp);
- struct lov_obd *lov = &lov_mds_obd->u.lov;
- __u32 ost_num = lov->desc.ld_tgt_count, mdt_num = 1;
+ __u32 ost_num = mds->mds_lov_objid_count, mdt_num = 1;
struct quota_adjust_qunit *oqaq = NULL;
unsigned int qid[MAXQUOTAS] = { 0, 0 };
struct lustre_quota_info *info = &mds->mds_quota_info;
LQUOTA_FLAGS_ADJINO, oqaq);
if (rc < 0) {
- CDEBUG(D_ERROR, "create oqaq failed! (rc:%d)\n", rc);
+ CERROR("create oqaq failed! (rc:%d)\n", rc);
GOTO(out_sem, rc);
}
QAQ_DEBUG(oqaq, "show oqaq.\n")
if (adjust_res <= 0) {
if (adjust_res < 0) {
rc = adjust_res;
- CDEBUG(D_ERROR, "adjust mds slave's qunit size failed! \
- (rc:%d)\n", rc);
+ CERROR("adjust mds slave's qunit size failed! "
+ "(rc:%d)\n", rc);
} else {
CDEBUG(D_QUOTA, "qunit doesn't need to be adjusted.\n");
}
rc = 0;
}
if (rc) {
- CDEBUG(D_ERROR, "mds fail to adjust file quota! \
- (rc:%d)\n", rc);
+ CERROR("%s: mds fail to adjust file quota! (rc:%d)\n",
+ obd->obd_name, rc);
GOTO(out, rc);
}
}
if (rc2)
- CDEBUG(rc2 == QUOTA_REQ_RETURNED ? D_QUOTA: D_ERROR,
+ CDEBUG(D_QUOTA,
"mds adjust qunit %ssuccessfully! (opc:%d rc:%d)\n",
rc2 == QUOTA_REQ_RETURNED ? "" : "un", opc, rc2);
RETURN(0);
if (rc || rc2) {
if (!rc)
rc = rc2;
- CDEBUG(rc == QUOTA_REQ_RETURNED ? D_QUOTA: D_ERROR,
+ CDEBUG(D_QUOTA,
"filter adjust qunit %ssuccessfully! (opc:%d rc%d)\n",
- QUOTA_REQ_RETURNED ? "" : "un", opc, rc);
+ rc == QUOTA_REQ_RETURNED ? "" : "un", opc, rc);
}
RETURN(0);
fp = filp_open(name, O_CREAT | O_TRUNC | O_RDWR, 0644);
if (IS_ERR(fp)) {
rc = PTR_ERR(fp);
- CERROR("error invalidating admin quotafile %s (rc:%d)\n",
- name, rc);
+ CERROR("%s: error invalidating admin quotafile %s (rc:%d)\n",
+ obd->obd_name, name, rc);
}
else
filp_close(fp, 0);
/* -EINVAL may be returned by quotainfo for bad quota file */
if (rc != -ENOENT && rc != -EINVAL) {
- CERROR("error opening old quota file %s (%d)\n",
- name, rc);
+ CERROR("%s: error opening old quota file %s (%d)\n",
+ obd->obd_name, name, rc);
break;
}
fp = filp_open(name, O_CREAT | O_TRUNC | O_RDWR, 0644);
if (IS_ERR(fp)) {
rc = PTR_ERR(fp);
- CERROR("error creating admin quotafile %s (rc:%d)\n",
- name, rc);
+ CERROR("%s: error creating admin quotafile %s (rc:%d)\n",
+ obd->obd_name, name, rc);
break;
}
RETURN(-EINVAL);
down(&obt->obt_quotachecking);
- LASSERT(!obt->obt_qctxt.lqc_immutable);
+ if (obt->obt_qctxt.lqc_immutable) {
+ LCONSOLE_ERROR("Failed to turn Quota on, immutable mode "
+ "(is SOM enabled?)\n");
+ up(&obt->obt_quotachecking);
+ RETURN(-ECANCELED);
+ }
+
push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
down(&mds->mds_qonoff_sem);
rc2 = mds_admin_quota_on(obd, oqctl);
rc1 = fsfilt_quotactl(obd, obd->u.obt.obt_sb, oqctl);
if (!rc1) {
qctxt->lqc_flags |= UGQUOTA2LQC(oqctl->qc_type);
+ /* when quotaon, create lqs for every quota uid/gid b=18574 */
+ build_lqs(obd);
} else if (rc1 == -EBUSY && quota_is_on(qctxt, oqctl)) {
CWARN("mds local quota[%d] is on already\n", oqctl->qc_type);
rc1 = -EALREADY;
}
oqctl->qc_cmd = Q_QUOTAON;
}
+
EXIT;
out:
return rc ? : (rc1 ? : rc2);
}
-int mds_quota_off(struct obd_device *obd, struct obd_quotactl *oqctl)
+/* with obt->obt_quotachecking held */
+int do_mds_quota_off(struct obd_device *obd, struct obd_quotactl *oqctl)
{
struct mds_obd *mds = &obd->u.mds;
struct obd_device_target *obt = &obd->u.obt;
int rc = 0, rc1 = 0, rc2 = 0, imm;
ENTRY;
+ LASSERT_SEM_LOCKED(&obt->obt_quotachecking);
+
imm = oqctl->qc_type & IMMQUOTA;
oqctl->qc_type &= ~IMMQUOTA;
oqctl->qc_type != UGQUOTA)
RETURN(-EINVAL);
- down(&obt->obt_quotachecking);
push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
down(&mds->mds_qonoff_sem);
/* close admin quota files */
out:
up(&mds->mds_qonoff_sem);
pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
- up(&obt->obt_quotachecking);
return rc ? : (rc1 ? : rc2);
}
+int mds_quota_off(struct obd_device *obd, struct obd_quotactl *oqctl)
+{
+ struct obd_device_target *obt = &obd->u.obt;
+ int rc;
+ ENTRY;
+
+ down(&obt->obt_quotachecking);
+ rc = do_mds_quota_off(obd, oqctl);
+ up(&obt->obt_quotachecking);
+ RETURN(rc);
+}
+
int mds_set_dqinfo(struct obd_device *obd, struct obd_quotactl *oqctl)
{
struct mds_obd *mds = &obd->u.mds;
up(&dquot->dq_sem);
lustre_dqput(dquot);
+ up(&mds->mds_qonoff_sem);
/* the usages in admin quota file is inaccurate */
dqblk->dqb_curinodes = 0;
dqblk->dqb_curspace = 0;
rc = mds_get_space(obd, oqctl);
EXIT;
-
+ return rc;
out:
up(&mds->mds_qonoff_sem);
return rc;
unsigned short type;
ENTRY;
- ptlrpc_daemonize("qmaster_recovd");
+ cfs_daemonize_ctxt("qmaster_recovd");
/* for mds */
class_incref(obd, "qmaster_recovd_mds", obd);
rc = dquot_recovery(obd, dqid->di_id, type);
if (rc)
- CERROR("qmaster recovery failed! (id:%d type:%d"
- " rc:%d)\n", dqid->di_id, type, rc);
+ CERROR("%s: qmaster recovery failed for %sid %d"
+ " rc:%d)\n", obd->obd_name,
+ type ? "g" : "u", dqid->di_id, rc);
free:
OBD_FREE_PTR(dqid);
}
rc = kernel_thread(qmaster_recovery_main, &data, CLONE_VM|CLONE_FILES);
if (rc < 0)
- CERROR("Cannot start quota recovery thread: rc %d\n", rc);
+ CERROR("%s: cannot start quota recovery thread: rc %d\n",
+ obd->obd_name, rc);
wait_for_completion(&data.comp);
RETURN(rc);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff