From c95e41f163cb216498e06f2ca65d948699de137e Mon Sep 17 00:00:00 2001 From: Andrew Perepechko Date: Fri, 16 Apr 2010 13:31:18 -0700 Subject: [PATCH] b=21826 a small fix for quota files invalidation i=Johann Lombardi i=ZhiYong Tian --- lustre/quota/quota_master.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lustre/quota/quota_master.c b/lustre/quota/quota_master.c index 8d58de0..c72e477 100644 --- a/lustre/quota/quota_master.c +++ b/lustre/quota/quota_master.c @@ -645,6 +645,8 @@ int mds_quota_finvalidate(struct obd_device *obd, struct obd_quotactl *oqctl) RETURN(-EINVAL); cfs_down(&obt->obt_quotachecking); + if (obt->obt_qctxt.lqc_flags & UGQUOTA2LQC(oqctl->qc_type)) + GOTO(out, rc = -EBUSY); push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); cfs_down(&mds->mds_qonoff_sem); @@ -655,6 +657,7 @@ int mds_quota_finvalidate(struct obd_device *obd, struct obd_quotactl *oqctl) cfs_up(&mds->mds_qonoff_sem); pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); +out: cfs_up(&obt->obt_quotachecking); RETURN(rc); } -- 1.8.3.1