-/* -*- 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.
/*
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2012, Whamcloud, Inc.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
* Author: Niu YaWei <niu@clusterfs.com>
*/
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
-
#define DEBUG_SUBSYSTEM S_LQUOTA
#include <linux/version.h>
#include "quota_internal.h"
-#ifdef HAVE_QUOTA_SUPPORT
-
-/* lock ordering: mds->mds_qonoff_sem > dquot->dq_sem > lqs->lqs_lock */
+/* lock ordering: mds->mds_qonoff_sem > dquot->dq_mutex > lqs->lqs_lock */
static cfs_list_t lustre_dquot_hash[NR_DQHASH];
-static cfs_rwlock_t dquot_hash_lock = CFS_RW_LOCK_UNLOCKED;
+static DEFINE_RWLOCK(dquot_hash_lock);
cfs_mem_cache_t *lustre_dquot_cachep;
RETURN(NULL);
CFS_INIT_LIST_HEAD(&dquot->dq_hash);
- cfs_init_mutex_locked(&dquot->dq_sem);
+ cfs_mutex_init(&dquot->dq_mutex);
+ cfs_mutex_lock(&dquot->dq_mutex);
cfs_atomic_set(&dquot->dq_refcnt, 1);
dquot->dq_info = lqi;
dquot->dq_id = id;
if ((dquot = find_dquot(hashent, lqi, id, type)) != NULL) {
cfs_atomic_inc(&dquot->dq_refcnt);
cfs_read_unlock(&dquot_hash_lock);
+ cfs_mutex_unlock(&empty->dq_mutex);
free_dq = 1;
} else {
int rc;
dquot = empty;
rc = fsfilt_dquot(obd, dquot, QFILE_RD_DQUOT);
- cfs_up(&dquot->dq_sem);
+ cfs_mutex_unlock(&dquot->dq_mutex);
if (rc) {
CERROR("can't read dquot from admin quotafile! "
"(rc:%d)\n", rc);
- lustre_dqput(dquot);
+ free_dquot(dquot);
RETURN(ERR_PTR(rc));
} else {
cfs_write_lock(&dquot_hash_lock);
if (!oqaq)
GOTO(out, rc = -ENOMEM);
- cfs_down(&dquot->dq_sem);
+ cfs_mutex_lock(&dquot->dq_mutex);
init_oqaq(oqaq, qctxt, id, type);
rc = dquot_create_oqaq(qctxt, dquot, ost_num, mdt_num,
else
qid[USRQUOTA] = dquot->dq_id;
- cfs_up(&dquot->dq_sem);
+ cfs_mutex_unlock(&dquot->dq_mutex);
rc = qctxt_adjust_qunit(obd, qctxt, qid, is_blk, 0, NULL);
if (rc == -EDQUOT || rc == -EBUSY) {
RETURN(rc);
out_sem:
- cfs_up(&dquot->dq_sem);
+ cfs_mutex_unlock(&dquot->dq_mutex);
goto out;
}
if (OBD_FAIL_CHECK(OBD_FAIL_OBD_DQACQ))
RETURN(-EIO);
+ if (!ll_sb_has_quota_active(qctxt->lqc_sb,
+ QDATA_IS_GRP(qdata) ? GRPQUOTA : USRQUOTA))
+ RETURN(-EIO);
+
lqs = quota_search_lqs(LQS_KEY(QDATA_IS_GRP(qdata), qdata->qd_id),
qctxt, 0);
if (lqs == NULL)
DQUOT_DEBUG(dquot, "get dquot in dqacq_handler\n");
QINFO_DEBUG(dquot->dq_info, "get dquot in dqadq_handler\n");
- cfs_down(&dquot->dq_sem);
+ cfs_mutex_lock(&dquot->dq_mutex);
if (QDATA_IS_BLK(qdata)) {
grace = info->qi_info[QDATA_IS_GRP(qdata)].dqi_bgrace;
case QUOTA_DQREL:
/* The usage in administrative file might be incorrect before
* recovery done */
- if (*usage - qdata->qd_count < 0)
+ if (*usage < qdata->qd_count)
*usage = 0;
else
*usage -= qdata->qd_count;
rc = fsfilt_dquot(obd, dquot, QFILE_WR_DQUOT);
EXIT;
out:
- cfs_up(&dquot->dq_sem);
+ cfs_mutex_unlock(&dquot->dq_mutex);
cfs_up_write(&mds->mds_qonoff_sem);
lustre_dqput(dquot);
if (rc != -EDQUOT)
if (!Q_TYPESET(oqctl, i))
continue;
if (qinfo->qi_files[i] == NULL) {
- CWARN("quota[%d] is off already\n", i);
+ CDEBUG(D_QUOTA, "quota[%d] is off already\n", i);
rc = -EALREADY;
continue;
}
EXIT;
out:
+ CDEBUG(D_QUOTA, "%s: quotaoff type:flags:rc %u:%lu:%d\n",
+ obd->obd_name, oqctl->qc_type, qctxt->lqc_flags, rc);
cfs_up_write(&mds->mds_qonoff_sem);
pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
return rc ? : (rc1 ? : rc2);
if (!dquot || !oqaq)
RETURN(-EINVAL);
- LASSERT_SEM_LOCKED(&dquot->dq_sem);
+ LASSERT_MUTEX_LOCKED(&dquot->dq_mutex);
LASSERT(oqaq->qaq_iunit_sz);
LASSERT(oqaq->qaq_bunit_sz);
oqaq->qaq_bunit_sz =
QUSG(oqaq->qaq_bunit_sz * cqs_factor, 1)
<< QUOTABLOCK_BITS;
+ if (oqaq->qaq_bunit_sz >= qctxt->lqc_bunit_sz)
+ break;
b_limitation = oqaq->qaq_bunit_sz * (ost_num + 1) *
shrink_qunit_limit;
}
while (ilimit > dquot->dq_dqb.dqb_curinodes
+ 2 * i_limitation) {
oqaq->qaq_iunit_sz = oqaq->qaq_iunit_sz * cqs_factor;
+ if (oqaq->qaq_iunit_sz >= qctxt->lqc_iunit_sz)
+ break;
i_limitation = oqaq->qaq_iunit_sz * mdt_num *
shrink_qunit_limit;
}
if (rc)
GOTO(out, rc);
- cfs_down(&dquot->dq_sem);
+ cfs_mutex_lock(&dquot->dq_mutex);
cfs_spin_lock(&lqs->lqs_lock);
if (LQS_IS_SETQUOTA(lqs) || LQS_IS_RECOVERY(lqs)) {
cfs_spin_unlock(&lqs->lqs_lock);
- cfs_up(&dquot->dq_sem);
+ cfs_mutex_unlock(&dquot->dq_mutex);
GOTO(skip, rc = -EBUSY);
}
LQS_SET_SETQUOTA(lqs);
rc = fsfilt_dquot(obd, dquot, QFILE_WR_DQUOT);
- cfs_up(&dquot->dq_sem);
+ cfs_mutex_unlock(&dquot->dq_mutex);
if (rc) {
CERROR("set limit failed! (rc:%d)\n", rc);
orig_set = ihardlimit || isoftlimit;
now_set = dqblk->dqb_ihardlimit || dqblk->dqb_isoftlimit;
if (dqblk->dqb_valid & QIF_ILIMITS && orig_set != now_set) {
- cfs_down(&dquot->dq_sem);
+ cfs_mutex_lock(&dquot->dq_mutex);
dquot->dq_dqb.dqb_curinodes = 0;
- cfs_up(&dquot->dq_sem);
+ cfs_mutex_unlock(&dquot->dq_mutex);
rc = mds_init_slave_ilimits(obd, oqctl, orig_set);
if (rc) {
CERROR("init slave ilimits failed! (rc:%d)\n", rc);
orig_set = bhardlimit || bsoftlimit;
now_set = dqblk->dqb_bhardlimit || dqblk->dqb_bsoftlimit;
if (dqblk->dqb_valid & QIF_BLIMITS && orig_set != now_set) {
- cfs_down(&dquot->dq_sem);
+ cfs_mutex_lock(&dquot->dq_mutex);
dquot->dq_dqb.dqb_curspace = 0;
- cfs_up(&dquot->dq_sem);
+ cfs_mutex_unlock(&dquot->dq_mutex);
rc = mds_init_slave_blimits(obd, oqctl, orig_set);
if (rc) {
CERROR("init slave blimits failed! (rc:%d)\n", rc);
revoke_out:
cfs_down_write(&mds->mds_qonoff_sem);
- cfs_down(&dquot->dq_sem);
+ cfs_mutex_lock(&dquot->dq_mutex);
if (rc) {
/* cancel previous setting */
dquot->dq_dqb.dqb_ihardlimit = ihardlimit;
dquot->dq_dqb.dqb_itime = itime;
}
rc2 = fsfilt_dquot(obd, dquot, QFILE_WR_DQUOT);
- cfs_up(&dquot->dq_sem);
+ cfs_mutex_unlock(&dquot->dq_mutex);
update_fail:
cfs_spin_lock(&lqs->lqs_lock);
LQS_CLEAR_SETQUOTA(lqs);
if (IS_ERR(dquot))
GOTO(out, rc = PTR_ERR(dquot));
- cfs_down(&dquot->dq_sem);
+ cfs_mutex_lock(&dquot->dq_mutex);
dqblk->dqb_ihardlimit = dquot->dq_dqb.dqb_ihardlimit;
dqblk->dqb_isoftlimit = dquot->dq_dqb.dqb_isoftlimit;
dqblk->dqb_bhardlimit = dquot->dq_dqb.dqb_bhardlimit;
dqblk->dqb_btime = dquot->dq_dqb.dqb_btime;
dqblk->dqb_itime = dquot->dq_dqb.dqb_itime;
dqblk->dqb_valid |= QIF_LIMITS | QIF_TIMES;
- cfs_up(&dquot->dq_sem);
+ cfs_mutex_unlock(&dquot->dq_mutex);
lustre_dqput(dquot);
cfs_up_read(&mds->mds_qonoff_sem);
dqblk->dqb_curspace = 0;
rc = mds_get_space(obd, oqctl);
- /*
- * Querying of curinodes and/or curspace may have failed, administrative
- * quota data are likely to be better approximation to the real usage in
- * this case.
- */
- if (!(dqblk->dqb_valid & QIF_INODES) && dquot->dq_dqb.dqb_curinodes > 0)
- dqblk->dqb_curinodes = dquot->dq_dqb.dqb_curinodes;
-
- if (!(dqblk->dqb_valid & QIF_SPACE) && dquot->dq_dqb.dqb_curspace > 0)
- dqblk->dqb_curspace = dquot->dq_dqb.dqb_curspace;
-
RETURN(rc);
out:
if (rc)
GOTO(skip, rc);
- cfs_down(&dquot->dq_sem);
+ cfs_mutex_lock(&dquot->dq_mutex);
/* don't recover the dquot without limits or quota is setting or
* another recovery is already going on */
if (!(dquot->dq_dqb.dqb_bhardlimit || dquot->dq_dqb.dqb_bsoftlimit) ||
LQS_IS_SETQUOTA(lqs) || LQS_IS_RECOVERY(lqs)) {
- cfs_up(&dquot->dq_sem);
+ cfs_mutex_unlock(&dquot->dq_mutex);
GOTO(skip1, rc = 0);
}
cfs_spin_lock(&lqs->lqs_lock);
LQS_SET_RECOVERY(lqs);
cfs_spin_unlock(&lqs->lqs_lock);
- cfs_up(&dquot->dq_sem);
+ cfs_mutex_unlock(&dquot->dq_mutex);
/* release mds_qonoff_sem during obd_quotactl ops here */
cfs_up_write(&mds->mds_qonoff_sem);
total_limits += qctl->qc_dqblk.dqb_bhardlimit;
/* amend the usage of the administrative quotafile */
- cfs_down(&dquot->dq_sem);
+ cfs_mutex_lock(&dquot->dq_mutex);
dquot->dq_dqb.dqb_curspace = total_limits << QUOTABLOCK_BITS;
if (rc)
CERROR("write dquot failed! (rc:%d)\n", rc);
- cfs_up(&dquot->dq_sem);
+ cfs_mutex_unlock(&dquot->dq_mutex);
EXIT;
out:
cfs_spin_lock(&lqs->lqs_lock);
if (unlikely(!mds->mds_quota || obd->obd_stopping))
RETURN(rc);
- cfs_mutex_down(&obd->obd_dev_sem);
+ cfs_mutex_lock(&obd->obd_dev_mutex);
if (mds->mds_lov_desc.ld_active_tgt_count != mds->mds_lov_objid_count) {
CWARN("Only %u/%u OSTs are active, abort quota recovery\n",
mds->mds_lov_desc.ld_active_tgt_count,
mds->mds_lov_objid_count);
- cfs_mutex_up(&obd->obd_dev_sem);
+ cfs_mutex_unlock(&obd->obd_dev_mutex);
RETURN(rc);
}
- cfs_mutex_up(&obd->obd_dev_sem);
+ cfs_mutex_unlock(&obd->obd_dev_mutex);
data.obd = obd;
cfs_init_completion(&data.comp);
- rc = cfs_kernel_thread(qmaster_recovery_main, &data,
- CLONE_VM|CLONE_FILES);
+ rc = cfs_create_thread(qmaster_recovery_main, &data,
+ CFS_DAEMON_FLAGS);
if (rc < 0)
CERROR("%s: cannot start quota recovery thread: rc %d\n",
obd->obd_name, rc);
cfs_wait_for_completion(&data.comp);
RETURN(rc);
}
-
-#endif /* HAVE_QUOTA_SUPPORT */
git://git.whamcloud.com / fs / lustre-release.git / blobdiff