xfs: remove xfs_dqunlock and friends

There's really no point in wrapping the basic mutex operations.  Remove
the wrapper to ease lock analysis annotations and make the code a litte
easier to read.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Carlos Maiolino <cem@kernel.org>

diff --git a/fs/xfs/scrub/quota.c b/fs/xfs/scrub/quota.c
index 58d6d4ed2853b35c8ca4b1ec23b1890bbd700896..c78cf9f96cf6361c55e01f907af1f78697eef9a0 100644 (file)
--- a/fs/xfs/scrub/quota.c
+++ b/fs/xfs/scrub/quota.c
@@ -158,9 +158,9 @@ xchk_quota_item(
         * However, dqiterate gave us a locked dquot, so drop the dquot lock to
         * get the ILOCK.
         */
-       xfs_dqunlock(dq);
+       mutex_unlock(&dq->q_qlock);
        xchk_ilock(sc, XFS_ILOCK_SHARED);
-       xfs_dqlock(dq);
+       mutex_lock(&dq->q_qlock);
 
        /*
         * Except for the root dquot, the actual dquot we got must either have

diff --git a/fs/xfs/scrub/quota_repair.c b/fs/xfs/scrub/quota_repair.c
index 8f4c8d41f3083ac3a4b324ded7d1ffe5f5e303c6..8c89c6cc2950ab937ae014f32bac3b826c4bd4eb 100644 (file)
--- a/fs/xfs/scrub/quota_repair.c
+++ b/fs/xfs/scrub/quota_repair.c
@@ -187,9 +187,9 @@ xrep_quota_item(
         * dqiterate gave us a locked dquot, so drop the dquot lock to get the
         * ILOCK_EXCL.
         */
-       xfs_dqunlock(dq);
+       mutex_unlock(&dq->q_qlock);
        xchk_ilock(sc, XFS_ILOCK_EXCL);
-       xfs_dqlock(dq);
+       mutex_lock(&dq->q_qlock);
 
        error = xrep_quota_item_bmap(sc, dq, &dirty);
        xchk_iunlock(sc, XFS_ILOCK_EXCL);
@@ -258,7 +258,7 @@ xrep_quota_item(
        }
        xfs_trans_log_dquot(sc->tp, dq);
        error = xfs_trans_roll(&sc->tp);
-       xfs_dqlock(dq);
+       mutex_lock(&dq->q_qlock);
        return error;
 }
 

diff --git a/fs/xfs/scrub/quotacheck_repair.c b/fs/xfs/scrub/quotacheck_repair.c
index dd8554c755b5bfe508b04678c25641cf2de19ba8..415314911499bd63583b2fc884c8f223244d0d95 100644 (file)
--- a/fs/xfs/scrub/quotacheck_repair.c
+++ b/fs/xfs/scrub/quotacheck_repair.c
@@ -53,9 +53,9 @@ xqcheck_commit_dquot(
        int                     error = 0;
 
        /* Unlock the dquot just long enough to allocate a transaction. */
-       xfs_dqunlock(dq);
+       mutex_unlock(&dq->q_qlock);
        error = xchk_trans_alloc(xqc->sc, 0);
-       xfs_dqlock(dq);
+       mutex_lock(&dq->q_qlock);
        if (error)
                return error;
 
@@ -122,7 +122,7 @@ xqcheck_commit_dquot(
         * dquot).
         */
        error = xrep_trans_commit(xqc->sc);
-       xfs_dqlock(dq);
+       mutex_lock(&dq->q_qlock);
        return error;
 
 out_unlock:
@@ -131,7 +131,7 @@ out_cancel:
        xchk_trans_cancel(xqc->sc);
 
        /* Re-lock the dquot so the caller can put the reference. */
-       xfs_dqlock(dq);
+       mutex_lock(&dq->q_qlock);
        return error;
 }
 

diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
index 79e14ee1d7a07a705c5195da94b41f15e45196eb..c2326cee7fae8a5caae5226bf12a45d945fe0035 100644 (file)
--- a/fs/xfs/xfs_dquot.c
+++ b/fs/xfs/xfs_dquot.c
@@ -31,7 +31,7 @@
  *
  * ip->i_lock
  *   qi->qi_tree_lock
- *     dquot->q_qlock (xfs_dqlock() and friends)
+ *     dquot->q_qlock
  *       dquot->q_flush (xfs_dqflock() and friends)
  *       qi->qi_lru_lock
  *
@@ -816,9 +816,9 @@ restart:
                return NULL;
        }
 
-       xfs_dqlock(dqp);
+       mutex_lock(&dqp->q_qlock);
        if (dqp->q_flags & XFS_DQFLAG_FREEING) {
-               xfs_dqunlock(dqp);
+               mutex_unlock(&dqp->q_qlock);
                mutex_unlock(&qi->qi_tree_lock);
                trace_xfs_dqget_freeing(dqp);
                delay(1);
@@ -865,7 +865,7 @@ xfs_qm_dqget_cache_insert(
        }
 
        /* Return a locked dquot to the caller, with a reference taken. */
-       xfs_dqlock(dqp);
+       mutex_lock(&dqp->q_qlock);
        dqp->q_nrefs = 1;
        qi->qi_dquots++;
 
@@ -1051,7 +1051,7 @@ restart:
                if (dqp1) {
                        xfs_qm_dqdestroy(dqp);
                        dqp = dqp1;
-                       xfs_dqlock(dqp);
+                       mutex_lock(&dqp->q_qlock);
                        goto dqret;
                }
        } else {
@@ -1136,7 +1136,7 @@ xfs_qm_dqput(
                if (list_lru_add_obj(&qi->qi_lru, &dqp->q_lru))
                        XFS_STATS_INC(dqp->q_mount, xs_qm_dquot_unused);
        }
-       xfs_dqunlock(dqp);
+       mutex_unlock(&dqp->q_qlock);
 }
 
 /*
@@ -1152,7 +1152,7 @@ xfs_qm_dqrele(
 
        trace_xfs_dqrele(dqp);
 
-       xfs_dqlock(dqp);
+       mutex_lock(&dqp->q_qlock);
        /*
         * We don't care to flush it if the dquot is dirty here.
         * That will create stutters that we want to avoid.

diff --git a/fs/xfs/xfs_dquot.h b/fs/xfs/xfs_dquot.h
index 61217adf5ba5512b5087fc7e0c11590ad6f85e1f..10c39b8cdd039a4f8077e88c13c702d425600e0c 100644 (file)
--- a/fs/xfs/xfs_dquot.h
+++ b/fs/xfs/xfs_dquot.h
@@ -121,21 +121,6 @@ static inline void xfs_dqfunlock(struct xfs_dquot *dqp)
        complete(&dqp->q_flush);
 }
 
-static inline int xfs_dqlock_nowait(struct xfs_dquot *dqp)
-{
-       return mutex_trylock(&dqp->q_qlock);
-}
-
-static inline void xfs_dqlock(struct xfs_dquot *dqp)
-{
-       mutex_lock(&dqp->q_qlock);
-}
-
-static inline void xfs_dqunlock(struct xfs_dquot *dqp)
-{
-       mutex_unlock(&dqp->q_qlock);
-}
-
 static inline int
 xfs_dquot_type(const struct xfs_dquot *dqp)
 {
@@ -246,9 +231,9 @@ void xfs_dquot_detach_buf(struct xfs_dquot *dqp);
 
 static inline struct xfs_dquot *xfs_qm_dqhold(struct xfs_dquot *dqp)
 {
-       xfs_dqlock(dqp);
+       mutex_lock(&dqp->q_qlock);
        dqp->q_nrefs++;
-       xfs_dqunlock(dqp);
+       mutex_unlock(&dqp->q_qlock);
        return dqp;
 }
 

diff --git a/fs/xfs/xfs_dquot_item.c b/fs/xfs/xfs_dquot_item.c
index 271b195ebb9326d3007a11a2df384fe21736c6a2..b374cd9f1900341b97ac6b9eee1ed0c668ea8d5b 100644 (file)
--- a/fs/xfs/xfs_dquot_item.c
+++ b/fs/xfs/xfs_dquot_item.c
@@ -132,7 +132,7 @@ xfs_qm_dquot_logitem_push(
        if (atomic_read(&dqp->q_pincount) > 0)
                return XFS_ITEM_PINNED;
 
-       if (!xfs_dqlock_nowait(dqp))
+       if (!mutex_trylock(&dqp->q_qlock))
                return XFS_ITEM_LOCKED;
 
        /*
@@ -177,7 +177,7 @@ xfs_qm_dquot_logitem_push(
 out_relock_ail:
        spin_lock(&lip->li_ailp->ail_lock);
 out_unlock:
-       xfs_dqunlock(dqp);
+       mutex_unlock(&dqp->q_qlock);
        return rval;
 }
 
@@ -195,7 +195,7 @@ xfs_qm_dquot_logitem_release(
         * transaction layer, within trans_commit. Hence, no LI_HOLD flag
         * for the logitem.
         */
-       xfs_dqunlock(dqp);
+       mutex_unlock(&dqp->q_qlock);
 }
 
 STATIC void

diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index 18a19947bbdbac1d0eb0676595d2bf3cc352bfaf..3e88bea9a4657deccdb6886798a935dde8f14297 100644 (file)
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -128,7 +128,7 @@ xfs_qm_dqpurge(
        struct xfs_quotainfo    *qi = dqp->q_mount->m_quotainfo;
        int                     error = -EAGAIN;
 
-       xfs_dqlock(dqp);
+       mutex_lock(&dqp->q_qlock);
        if ((dqp->q_flags & XFS_DQFLAG_FREEING) || dqp->q_nrefs != 0)
                goto out_unlock;
 
@@ -177,7 +177,7 @@ out_funlock:
                !test_bit(XFS_LI_IN_AIL, &dqp->q_logitem.qli_item.li_flags));
 
        xfs_dqfunlock(dqp);
-       xfs_dqunlock(dqp);
+       mutex_unlock(&dqp->q_qlock);
 
        radix_tree_delete(xfs_dquot_tree(qi, xfs_dquot_type(dqp)), dqp->q_id);
        qi->qi_dquots--;
@@ -194,7 +194,7 @@ out_funlock:
        return 0;
 
 out_unlock:
-       xfs_dqunlock(dqp);
+       mutex_unlock(&dqp->q_qlock);
        return error;
 }
 
@@ -329,7 +329,7 @@ xfs_qm_dqattach_one(
         * that the dquot returned is the one that should go in the inode.
         */
        *IO_idqpp = dqp;
-       xfs_dqunlock(dqp);
+       mutex_unlock(&dqp->q_qlock);
        return 0;
 }
 
@@ -468,7 +468,7 @@ xfs_qm_dquot_isolate(
        struct xfs_qm_isolate   *isol = arg;
        enum lru_status         ret = LRU_SKIP;
 
-       if (!xfs_dqlock_nowait(dqp))
+       if (!mutex_trylock(&dqp->q_qlock))
                goto out_miss_busy;
 
        /*
@@ -494,7 +494,7 @@ xfs_qm_dquot_isolate(
         * the freelist and try again.
         */
        if (dqp->q_nrefs) {
-               xfs_dqunlock(dqp);
+               mutex_unlock(&dqp->q_qlock);
                XFS_STATS_INC(dqp->q_mount, xs_qm_dqwants);
 
                trace_xfs_dqreclaim_want(dqp);
@@ -519,7 +519,7 @@ xfs_qm_dquot_isolate(
         * Prevent lookups now that we are past the point of no return.
         */
        dqp->q_flags |= XFS_DQFLAG_FREEING;
-       xfs_dqunlock(dqp);
+       mutex_unlock(&dqp->q_qlock);
 
        ASSERT(dqp->q_nrefs == 0);
        list_lru_isolate_move(lru, &dqp->q_lru, &isol->dispose);
@@ -529,7 +529,7 @@ xfs_qm_dquot_isolate(
        return LRU_REMOVED;
 
 out_miss_unlock:
-       xfs_dqunlock(dqp);
+       mutex_unlock(&dqp->q_qlock);
 out_miss_busy:
        trace_xfs_dqreclaim_busy(dqp);
        XFS_STATS_INC(dqp->q_mount, xs_qm_dqreclaim_misses);
@@ -1467,7 +1467,7 @@ xfs_qm_flush_one(
        struct xfs_buf          *bp = NULL;
        int                     error = 0;
 
-       xfs_dqlock(dqp);
+       mutex_lock(&dqp->q_qlock);
        if (dqp->q_flags & XFS_DQFLAG_FREEING)
                goto out_unlock;
        if (!XFS_DQ_IS_DIRTY(dqp))
@@ -1489,7 +1489,7 @@ xfs_qm_flush_one(
                xfs_buf_delwri_queue(bp, buffer_list);
        xfs_buf_relse(bp);
 out_unlock:
-       xfs_dqunlock(dqp);
+       mutex_unlock(&dqp->q_qlock);
        return error;
 }
 
@@ -1952,7 +1952,7 @@ xfs_qm_vop_dqalloc(
                        /*
                         * Get the ilock in the right order.
                         */
-                       xfs_dqunlock(uq);
+                       mutex_unlock(&uq->q_qlock);
                        lockflags = XFS_ILOCK_SHARED;
                        xfs_ilock(ip, lockflags);
                } else {
@@ -1974,7 +1974,7 @@ xfs_qm_vop_dqalloc(
                                ASSERT(error != -ENOENT);
                                goto error_rele;
                        }
-                       xfs_dqunlock(gq);
+                       mutex_unlock(&gq->q_qlock);
                        lockflags = XFS_ILOCK_SHARED;
                        xfs_ilock(ip, lockflags);
                } else {
@@ -1992,7 +1992,7 @@ xfs_qm_vop_dqalloc(
                                ASSERT(error != -ENOENT);
                                goto error_rele;
                        }
-                       xfs_dqunlock(pq);
+                       mutex_unlock(&pq->q_qlock);
                        lockflags = XFS_ILOCK_SHARED;
                        xfs_ilock(ip, lockflags);
                } else {
@@ -2079,7 +2079,7 @@ xfs_qm_vop_chown(
         * back now.
         */
        tp->t_flags |= XFS_TRANS_DIRTY;
-       xfs_dqlock(prevdq);
+       mutex_lock(&prevdq->q_qlock);
        if (isrt) {
                ASSERT(prevdq->q_rtb.reserved >= ip->i_delayed_blks);
                prevdq->q_rtb.reserved -= ip->i_delayed_blks;
@@ -2087,7 +2087,7 @@ xfs_qm_vop_chown(
                ASSERT(prevdq->q_blk.reserved >= ip->i_delayed_blks);
                prevdq->q_blk.reserved -= ip->i_delayed_blks;
        }
-       xfs_dqunlock(prevdq);
+       mutex_unlock(&prevdq->q_qlock);
 
        /*
         * Take an extra reference, because the inode is going to keep

diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
index 0c78f30fa4a3ff5b76f3d388b3f7fcbec6072982..59ef382900fe00d2d97cf4857c8931eed3737d33 100644 (file)
--- a/fs/xfs/xfs_qm_syscalls.c
+++ b/fs/xfs/xfs_qm_syscalls.c
@@ -303,13 +303,13 @@ xfs_qm_scall_setqlim(
        }
 
        defq = xfs_get_defquota(q, xfs_dquot_type(dqp));
-       xfs_dqunlock(dqp);
+       mutex_unlock(&dqp->q_qlock);
 
        error = xfs_trans_alloc(mp, &M_RES(mp)->tr_qm_setqlim, 0, 0, 0, &tp);
        if (error)
                goto out_rele;
 
-       xfs_dqlock(dqp);
+       mutex_lock(&dqp->q_qlock);
        xfs_trans_dqjoin(tp, dqp);
 
        /*

diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c
index 765456bf342851850cc2da914a8a75d689a27106..c842ce06acd6e830a4dccfb04b79fb05fbeaae9b 100644 (file)
--- a/fs/xfs/xfs_trans_dquot.c
+++ b/fs/xfs/xfs_trans_dquot.c
@@ -393,7 +393,7 @@ xfs_trans_dqlockedjoin(
        unsigned int            i;
        ASSERT(q[0].qt_dquot != NULL);
        if (q[1].qt_dquot == NULL) {
-               xfs_dqlock(q[0].qt_dquot);
+               mutex_lock(&q[0].qt_dquot->q_qlock);
                xfs_trans_dqjoin(tp, q[0].qt_dquot);
        } else if (q[2].qt_dquot == NULL) {
                xfs_dqlock2(q[0].qt_dquot, q[1].qt_dquot);
@@ -693,7 +693,7 @@ xfs_trans_unreserve_and_mod_dquots(
                        locked = already_locked;
                        if (qtrx->qt_blk_res) {
                                if (!locked) {
-                                       xfs_dqlock(dqp);
+                                       mutex_lock(&dqp->q_qlock);
                                        locked = true;
                                }
                                dqp->q_blk.reserved -=
@@ -701,7 +701,7 @@ xfs_trans_unreserve_and_mod_dquots(
                        }
                        if (qtrx->qt_ino_res) {
                                if (!locked) {
-                                       xfs_dqlock(dqp);
+                                       mutex_lock(&dqp->q_qlock);
                                        locked = true;
                                }
                                dqp->q_ino.reserved -=
@@ -710,14 +710,14 @@ xfs_trans_unreserve_and_mod_dquots(
 
                        if (qtrx->qt_rtblk_res) {
                                if (!locked) {
-                                       xfs_dqlock(dqp);
+                                       mutex_lock(&dqp->q_qlock);
                                        locked = true;
                                }
                                dqp->q_rtb.reserved -=
                                        (xfs_qcnt_t)qtrx->qt_rtblk_res;
                        }
                        if (locked && !already_locked)
-                               xfs_dqunlock(dqp);
+                               mutex_unlock(&dqp->q_qlock);
 
                }
        }
@@ -820,7 +820,7 @@ xfs_trans_dqresv(
        struct xfs_dquot_res    *blkres;
        struct xfs_quota_limits *qlim;
 
-       xfs_dqlock(dqp);
+       mutex_lock(&dqp->q_qlock);
 
        defq = xfs_get_defquota(q, xfs_dquot_type(dqp));
 
@@ -887,16 +887,16 @@ xfs_trans_dqresv(
            XFS_IS_CORRUPT(mp, dqp->q_ino.reserved < dqp->q_ino.count))
                goto error_corrupt;
 
-       xfs_dqunlock(dqp);
+       mutex_unlock(&dqp->q_qlock);
        return 0;
 
 error_return:
-       xfs_dqunlock(dqp);
+       mutex_unlock(&dqp->q_qlock);
        if (xfs_dquot_type(dqp) == XFS_DQTYPE_PROJ)
                return -ENOSPC;
        return -EDQUOT;
 error_corrupt:
-       xfs_dqunlock(dqp);
+       mutex_unlock(&dqp->q_qlock);
        xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE);
        xfs_fs_mark_sick(mp, XFS_SICK_FS_QUOTACHECK);
        return -EFSCORRUPTED;