From 8a65a51886de1b9627a68318b3293c6aacbe8e57 Mon Sep 17 00:00:00 2001 From: kib Date: Wed, 29 Feb 2012 01:39:39 +0000 Subject: [PATCH 151/175] MFC r232003: Properly lock DQREF() with dqhlock. Missed locking caused counter corruption. Assert that the dq reference value is sane before decrementing it. git-svn-id: http://svn.freebsd.org/base/stable/9@232285 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f (cherry picked from commit 38c5fcdcd268f55bf74e9eab689492abeefd4f7a) Signed-off-by: Xin Li --- sys/ufs/ufs/ufs_quota.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c index ce89efa..b652bec 100644 --- a/sys/ufs/ufs/ufs_quota.c +++ b/sys/ufs/ufs/ufs_quota.c @@ -1469,6 +1469,7 @@ dqrele(struct vnode *vp, struct dquot *dq) if (dq == NODQUOT) return; DQH_LOCK(); + KASSERT(dq->dq_cnt > 0, ("Lost dq %p reference 1", dq)); if (dq->dq_cnt > 1) { dq->dq_cnt--; DQH_UNLOCK(); @@ -1479,6 +1480,7 @@ sync: (void) dqsync(vp, dq); DQH_LOCK(); + KASSERT(dq->dq_cnt > 0, ("Lost dq %p reference 2", dq)); if (--dq->dq_cnt > 0) { DQH_UNLOCK(); @@ -1658,6 +1660,7 @@ quotaref(vp, qrp) */ found = 0; ip = VTOI(vp); + mtx_lock(&dqhlock); for (i = 0; i < MAXQUOTAS; i++) { if ((dq = ip->i_dquot[i]) == NODQUOT) continue; @@ -1665,6 +1668,7 @@ quotaref(vp, qrp) qrp[i] = dq; found++; } + mtx_unlock(&dqhlock); return (found); } -- 1.7.9.4