From 99f747330dfd57e3236eb03ad6c5d83adb31dafe Mon Sep 17 00:00:00 2001 From: Andrew Perepechko Date: Thu, 2 Dec 2010 01:49:02 +0300 Subject: [PATCH] Revert "b=23913 fix "ASSERTION(!cfs_list_empty(&dquot->dq_hash)) failed"" This reverts commit 9491d5d931407ccf68d95932ca4ea3c545c6f86d. --- lustre/quota/quota_master.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lustre/quota/quota_master.c b/lustre/quota/quota_master.c index fc9106f..5cec4e7 100644 --- a/lustre/quota/quota_master.c +++ b/lustre/quota/quota_master.c @@ -217,7 +217,7 @@ static struct lustre_dquot *lustre_dqget(struct obd_device *obd, if (rc) { CERROR("can't read dquot from admin quotafile! " "(rc:%d)\n", rc); - free_dquot(dquot); + lustre_dqput(dquot); RETURN(ERR_PTR(rc)); } @@ -438,10 +438,6 @@ out: dqacq_adjust_qunit_sz(obd, qdata->qd_id, QDATA_IS_GRP(qdata), QDATA_IS_BLK(qdata)); - 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 || IS_ERR(lqs)) { -- 1.8.3.1