xfs: get quota inode from mp & flags rather than dqp

Allow us to get the appropriate quota inode from any
mp & quota flags, not necessarily associated with a
particular dqp.  Needed for when we are searching for
the next active ID with quotas and we want to examine
the quota inode.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

2 files changed, 7 insertions, 6 deletions

diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
index c9c7c2d89245..5dbde0d65f37 100644
--- a/fs/xfs/xfs_dquot.c
+++ b/fs/xfs/xfs_dquot.c
@@ -464,12 +464,13 @@ xfs_qm_dqtobp(
         struct xfs_bmbt_irec    map;
         int                     nmaps = 1, error;
         struct xfs_buf          *bp;
-        struct xfs_inode        *quotip = xfs_dq_to_quota_inode(dqp);
+        struct xfs_inode        *quotip;
         struct xfs_mount        *mp = dqp->q_mount;
         xfs_dqid_t              id = be32_to_cpu(dqp->q_core.d_id);
         struct xfs_trans        *tp = (tpp ? *tpp : NULL);
         uint                    lock_mode;
 
+        quotip = xfs_quota_inode(dqp->q_mount, dqp->dq_flags);
         dqp->q_fileoffset = (xfs_fileoff_t)id / mp->m_quotainfo->qi_dqperchunk;
 
         lock_mode = xfs_ilock_data_map_shared(quotip);
diff --git a/fs/xfs/xfs_qm.h b/fs/xfs/xfs_qm.h
index 996a04064894..8901a01bc354 100644
--- a/fs/xfs/xfs_qm.h
+++ b/fs/xfs/xfs_qm.h
@@ -104,15 +104,15 @@ xfs_dquot_tree(
 }
 
 static inline struct xfs_inode *
-xfs_dq_to_quota_inode(struct xfs_dquot *dqp)
+xfs_quota_inode(xfs_mount_t *mp, uint dq_flags)
 {
-        switch (dqp->dq_flags & XFS_DQ_ALLTYPES) {
+        switch (dq_flags & XFS_DQ_ALLTYPES) {
         case XFS_DQ_USER:
-                return dqp->q_mount->m_quotainfo->qi_uquotaip;
+                return mp->m_quotainfo->qi_uquotaip;
         case XFS_DQ_GROUP:
-                return dqp->q_mount->m_quotainfo->qi_gquotaip;
+                return mp->m_quotainfo->qi_gquotaip;
         case XFS_DQ_PROJ:
-                return dqp->q_mount->m_quotainfo->qi_pquotaip;
+                return mp->m_quotainfo->qi_pquotaip;
         default:
                 ASSERT(0);
         }