xfs: fold xfs_qm_dqattach_one into xfs_qm_dqget_inode

xfs_qm_dqattach_one is a thin wrapper around xfs_qm_dqget_inode.  Move
the extra asserts into xfs_qm_dqget_inode, drop the unneeded q_qlock
roundtrip and merge the two functions.

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/xfs_dquot.c b/fs/xfs/xfs_dquot.c
index 8b4434e6df09ba18b70ab9503aa32462a117aa58..862fec529512fb14fcf5e92936455cf14da04b8c 100644 (file)
--- a/fs/xfs/xfs_dquot.c
+++ b/fs/xfs/xfs_dquot.c
@@ -994,7 +994,7 @@ xfs_qm_dqget_inode(
        struct xfs_inode        *ip,
        xfs_dqtype_t            type,
        bool                    can_alloc,
-       struct xfs_dquot        **O_dqpp)
+       struct xfs_dquot        **dqpp)
 {
        struct xfs_mount        *mp = ip->i_mount;
        struct xfs_quotainfo    *qi = mp->m_quotainfo;
@@ -1003,6 +1003,9 @@ xfs_qm_dqget_inode(
        xfs_dqid_t              id;
        int                     error;
 
+       ASSERT(!*dqpp);
+       xfs_assert_ilocked(ip, XFS_ILOCK_EXCL);
+
        error = xfs_qm_dqget_checks(mp, type);
        if (error)
                return error;
@@ -1068,8 +1071,8 @@ dqret:
        xfs_assert_ilocked(ip, XFS_ILOCK_EXCL);
        trace_xfs_dqget_miss(dqp);
 found:
-       *O_dqpp = dqp;
-       mutex_lock(&dqp->q_qlock);
+       trace_xfs_dqattach_get(dqp);
+       *dqpp = dqp;
        return 0;
 }
 

diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index b571eff51694a0957f7568cfe599f055cb328bc6..f3f7947bc4ed401e80d9283734fcc6c67f56db28 100644 (file)
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -287,40 +287,6 @@ xfs_qm_unmount_quotas(
                xfs_qm_destroy_quotainos(mp->m_quotainfo);
 }
 
-STATIC int
-xfs_qm_dqattach_one(
-       struct xfs_inode        *ip,
-       xfs_dqtype_t            type,
-       bool                    doalloc,
-       struct xfs_dquot        **IO_idqpp)
-{
-       struct xfs_dquot        *dqp;
-       int                     error;
-
-       ASSERT(!*IO_idqpp);
-       xfs_assert_ilocked(ip, XFS_ILOCK_EXCL);
-
-       /*
-        * Find the dquot from somewhere. This bumps the reference count of
-        * dquot and returns it locked.  This can return ENOENT if dquot didn't
-        * exist on disk and we didn't ask it to allocate; ESRCH if quotas got
-        * turned off suddenly.
-        */
-       error = xfs_qm_dqget_inode(ip, type, doalloc, &dqp);
-       if (error)
-               return error;
-
-       trace_xfs_dqattach_get(dqp);
-
-       /*
-        * dqget may have dropped and re-acquired the ilock, but it guarantees
-        * that the dquot returned is the one that should go in the inode.
-        */
-       *IO_idqpp = dqp;
-       mutex_unlock(&dqp->q_qlock);
-       return 0;
-}
-
 static bool
 xfs_qm_need_dqattach(
        struct xfs_inode        *ip)
@@ -360,7 +326,7 @@ xfs_qm_dqattach_locked(
        ASSERT(!xfs_is_metadir_inode(ip));
 
        if (XFS_IS_UQUOTA_ON(mp) && !ip->i_udquot) {
-               error = xfs_qm_dqattach_one(ip, XFS_DQTYPE_USER,
+               error = xfs_qm_dqget_inode(ip, XFS_DQTYPE_USER,
                                doalloc, &ip->i_udquot);
                if (error)
                        goto done;
@@ -368,7 +334,7 @@ xfs_qm_dqattach_locked(
        }
 
        if (XFS_IS_GQUOTA_ON(mp) && !ip->i_gdquot) {
-               error = xfs_qm_dqattach_one(ip, XFS_DQTYPE_GROUP,
+               error = xfs_qm_dqget_inode(ip, XFS_DQTYPE_GROUP,
                                doalloc, &ip->i_gdquot);
                if (error)
                        goto done;
@@ -376,7 +342,7 @@ xfs_qm_dqattach_locked(
        }
 
        if (XFS_IS_PQUOTA_ON(mp) && !ip->i_pdquot) {
-               error = xfs_qm_dqattach_one(ip, XFS_DQTYPE_PROJ,
+               error = xfs_qm_dqget_inode(ip, XFS_DQTYPE_PROJ,
                                doalloc, &ip->i_pdquot);
                if (error)
                        goto done;