* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
}
EXPORT_SYMBOL(lprocfs_quota_rd_type);
-static int auto_quota_on(struct obd_device *obd, int type,
- struct super_block *sb, int is_master)
+/*
+ * generic_quota_on is very lazy and tolerant about current quota settings
+ * @global means to turn on quotas on each OST additionally to local quotas;
+ * should not be called from filter_quota_ctl on MDS nodes (as it starts
+ * admin quotas on MDS nodes).
+ */
+int generic_quota_on(struct obd_device *obd, struct obd_quotactl *oqctl, int global)
{
- struct obd_quotactl *oqctl;
+ struct obd_device_target *obt = &obd->u.obt;
struct lvfs_run_ctxt saved;
- int rc = 0, id;
- struct obd_device_target *obt;
- ENTRY;
+ int id, is_master, rc = 0, local; /* means we need a local quotaon */
- LASSERT(type == USRQUOTA || type == GRPQUOTA || type == UGQUOTA);
-
- obt = &obd->u.obt;
-
- OBD_ALLOC_PTR(oqctl);
- if (!oqctl)
- RETURN(-ENOMEM);
-
- if (!atomic_dec_and_test(&obt->obt_quotachecking)) {
- CDEBUG(D_INFO, "other people are doing quotacheck\n");
- atomic_inc(&obt->obt_quotachecking);
- RETURN(-EBUSY);
- }
-
- id = UGQUOTA2LQC(type);
- /* quota already turned on */
- if ((obt->obt_qctxt.lqc_flags & id) == id) {
- rc = 0;
- goto out;
- }
+ cfs_down(&obt->obt_quotachecking);
+ push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+ id = UGQUOTA2LQC(oqctl->qc_type);
+ local = (obt->obt_qctxt.lqc_flags & id) != id;
- oqctl->qc_type = type;
oqctl->qc_cmd = Q_QUOTAON;
oqctl->qc_id = obt->obt_qfmt;
- push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+ is_master = !strcmp(obd->obd_type->typ_name, LUSTRE_MDS_NAME);
if (is_master) {
- struct mds_obd *mds = &obd->u.mds;
+ cfs_down_write(&obd->u.mds.mds_qonoff_sem);
+ if (local) {
+ /* turn on cluster wide quota */
+ rc = mds_admin_quota_on(obd, oqctl);
+ if (rc && rc != -ENOENT)
+ CERROR("%s: %s admin quotaon failed. rc=%d\n",
+ obd->obd_name, global ? "global":"local",
+ rc);
+ }
+ }
- down(&mds->mds_qonoff_sem);
- /* turn on cluster wide quota */
- rc = mds_admin_quota_on(obd, oqctl);
- if (rc)
- CDEBUG(rc == -ENOENT ? D_QUOTA : D_ERROR,
- "auto-enable admin quota failed. rc=%d\n", rc);
- up(&mds->mds_qonoff_sem);
+ if (rc == 0) {
+ if (local) {
+ rc = fsfilt_quotactl(obd, obt->obt_sb, oqctl);
+ if (rc) {
+ if (rc != -ENOENT)
+ CERROR("%s: %s quotaon failed with"
+ " rc=%d\n", obd->obd_name,
+ global ? "global" : "local", rc);
+ } else {
+ obt->obt_qctxt.lqc_flags |= UGQUOTA2LQC(oqctl->qc_type);
+ build_lqs(obd);
+ }
+ }
+ if (rc == 0 && global && is_master)
+ rc = obd_quotactl(obd->u.mds.mds_lov_exp, oqctl);
}
- if (!rc) {
- /* turn on local quota */
- rc = fsfilt_quotactl(obd, sb, oqctl);
- if (rc)
- CDEBUG(rc == -ENOENT ? D_QUOTA : D_ERROR,
- "auto-enable local quota failed. rc=%d\n", rc);
- else
- obt->obt_qctxt.lqc_flags |= UGQUOTA2LQC(type);
- }
+
+ if (is_master)
+ cfs_up_write(&obd->u.mds.mds_qonoff_sem);
pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+ cfs_up(&obt->obt_quotachecking);
-out:
- atomic_inc(&obt->obt_quotachecking);
+ CDEBUG(D_QUOTA, "%s: quotaon type:master:global:local:flags:rc "
+ "%u:%d:%d:%d:%lu:%d\n",
+ obd->obd_name, oqctl->qc_type, is_master, global, local,
+ obt->obt_qctxt.lqc_flags, rc);
+
+ return rc;
+}
+
+static int auto_quota_on(struct obd_device *obd, int type)
+{
+ struct obd_quotactl *oqctl;
+ int rc;
+ ENTRY;
+
+ LASSERT(type == USRQUOTA || type == GRPQUOTA || type == UGQUOTA);
+
+ OBD_ALLOC_PTR(oqctl);
+ if (!oqctl)
+ RETURN(-ENOMEM);
+
+ oqctl->qc_type = type;
+
+ rc = generic_quota_on(obd, oqctl, 0);
OBD_FREE_PTR(oqctl);
RETURN(rc);
if (count > MAX_STYPE_SIZE)
return -EINVAL;
- if (copy_from_user(stype, buffer, count))
+ if (cfs_copy_from_user(stype, buffer, count))
return -EFAULT;
for (i = 0 ; i < count ; i++) {
}
}
- if (type != 0)
- auto_quota_on(obd, type - 1, obt->obt_sb, is_mds);
+ if (type != 0) {
+ int rc = auto_quota_on(obd, type - 1);
+
+ if (rc && rc != -EALREADY && rc != -ENOENT)
+ return rc;
+ }
return count;
}
lprocfs_quota_wr_switch_seconds, 0 },
{ "quota_sync_blk", lprocfs_quota_rd_sync_blk,
lprocfs_quota_wr_sync_blk, 0},
+ { NULL }
};
struct lprocfs_vars lprocfs_quota_master_vars[] = {
lprocfs_quota_wr_least_iunit, 0 },
{ "quota_qs_factor", lprocfs_quota_rd_qs_factor,
lprocfs_quota_wr_qs_factor, 0 },
+ { NULL }
};
int lquota_proc_setup(struct obd_device *obd, int is_master)
lprocfs_quota_common_vars, obd);
if (IS_ERR(qctxt->lqc_proc_dir)) {
rc = PTR_ERR(qctxt->lqc_proc_dir);
- CERROR("error %d setting up lprocfs for %s\n", rc,
- obd->obd_name);
+ CERROR("%s: error %d setting up lprocfs\n",
+ obd->obd_name, rc);
qctxt->lqc_proc_dir = NULL;
GOTO(out, rc);
}
rc = lprocfs_add_vars(qctxt->lqc_proc_dir,
lprocfs_quota_master_vars, obd);
if (rc) {
- CERROR("error %d setting up lprocfs for %s"
- "(quota master)\n", rc, obd->obd_name);
+ CERROR("%s: error %d setting up lprocfs for "
+ "quota master\n", obd->obd_name, rc);
GOTO(out_free_proc, rc);
}
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff