X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fquota%2Flproc_quota.c;h=42fc7b85d714786f1563c74be1a7ecdfad5f77cb;hb=10a847d2511254d7cab0accbca03524d5c1fd909;hp=ce0f8ba9a8c2207b460e101bef6a9ee6c8c61f27;hpb=498ee35323fcacf829f4e77c91e7700cb3660111;p=fs%2Flustre-release.git diff --git a/lustre/quota/lproc_quota.c b/lustre/quota/lproc_quota.c index ce0f8ba..42fc7b8 100644 --- a/lustre/quota/lproc_quota.c +++ b/lustre/quota/lproc_quota.c @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,8 +24,10 @@ * 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. + * + * Copyright (c) 2011, Whamcloud, Inc. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -181,12 +181,9 @@ int lprocfs_quota_rd_type(char *page, char **start, off_t off, int count, struct obd_device *obd = (struct obd_device *)data; char stype[MAX_STYPE_SIZE + 1] = ""; int oq_type; - struct obd_device_target *obt; LASSERT(obd != NULL); - obt = &obd->u.obt; - /* Collect the needed information */ oq_type = obd->u.obt.obt_qctxt.lqc_flags; @@ -202,103 +199,105 @@ int lprocfs_quota_rd_type(char *page, char **start, off_t off, int count, } 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 lvfs_run_ctxt saved; - int rc = 0, rc1 = 0, id; struct obd_device_target *obt = &obd->u.obt; - struct lustre_quota_ctxt *qctxt = &obt->obt_qctxt; - struct mds_obd *mds = NULL; - ENTRY; - - LASSERT(type == USRQUOTA || type == GRPQUOTA || type == UGQUOTA); - - OBD_ALLOC_PTR(oqctl); - if (!oqctl) - RETURN(-ENOMEM); - - down(&obt->obt_quotachecking); - id = UGQUOTA2LQC(type); - /* quota already turned on */ - if ((obt->obt_qctxt.lqc_flags & id) == id) - GOTO(out, rc); + struct lvfs_run_ctxt saved; + int id, is_master, rc = 0, local; /* means we need a local quotaon */ - if (obt->obt_qctxt.lqc_immutable) { - LCONSOLE_ERROR("Failed to turn Quota on, immutable mode " - "(is SOM enabled?)\n"); - GOTO(out, rc = -ECANCELED); - } + 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) { - mds = &obd->u.mds; - down(&mds->mds_qonoff_sem); - /* turn on cluster wide quota */ - rc1 = mds_admin_quota_on(obd, oqctl); - if (rc1 && rc1 != -EALREADY) { - CDEBUG(rc1 == -ENOENT ? D_QUOTA : D_ERROR, - "auto-enable admin quota failed. rc=%d\n", rc1); - GOTO(out_ctxt, rc1); + 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); } } - /* turn on local quota */ - rc = fsfilt_quotactl(obd, sb, oqctl); - if (!rc) { - obt->obt_qctxt.lqc_flags |= UGQUOTA2LQC(type); - build_lqs(obd); - } else if (rc == -EBUSY && quota_is_on(qctxt, oqctl)) { - CWARN("mds local quota[%d] is on already\n", oqctl->qc_type); - rc = -EALREADY; - } else { - CDEBUG(rc == -ENOENT ? D_QUOTA : D_ERROR, - "auto-enable local quota failed. rc=%d\n", rc); - if (rc1 == -EALREADY) { - oqctl->qc_cmd = Q_QUOTAOFF; - mds_admin_quota_off(obd, oqctl); + 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); + } } - GOTO(out_ctxt, rc); + + if (rc == 0 && global && is_master) + rc = obd_quotactl(obd->u.mds.mds_lov_exp, oqctl); } - EXIT; + if (is_master) + cfs_up_write(&obd->u.mds.mds_qonoff_sem); -out_ctxt: - if (mds != NULL) - up(&mds->mds_qonoff_sem); pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); + cfs_up(&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); -out: - up(&obt->obt_quotachecking); - OBD_FREE_PTR(oqctl); 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); +} + int lprocfs_quota_wr_type(struct file *file, const char *buffer, unsigned long count, void *data) { struct obd_device *obd = (struct obd_device *)data; - struct obd_device_target *obt; - int type = 0, is_mds; + int type = 0; unsigned long i; char stype[MAX_STYPE_SIZE + 1] = ""; LASSERT(obd != NULL); - obt = &obd->u.obt; - - is_mds = !strcmp(obd->obd_type->typ_name, LUSTRE_MDS_NAME); - 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++) { @@ -321,9 +320,9 @@ int lprocfs_quota_wr_type(struct file *file, const char *buffer, } if (type != 0) { - int rc = auto_quota_on(obd, type - 1, obt->obt_sb, is_mds); + int rc = auto_quota_on(obd, type - 1); - if (rc && rc != -EALREADY) + if (rc && rc != -EALREADY && rc != -ENOENT) return rc; } @@ -592,8 +591,8 @@ 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); } @@ -602,8 +601,8 @@ int lquota_proc_setup(struct obd_device *obd, int is_master) 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); } }