xfs: also use xfs_bmap_btalloc_accounting for RT allocations

Make xfs_bmap_btalloc_accounting more generic by handling the RT quota
reservations and then also use it from xfs_bmap_rtalloc instead of
open coding the accounting logic there.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandanbabu@kernel.org>

diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index cad09a3da35d4b4e4809a011ff8c3c202291240c..396f242e593227925373d7bf36c6063ca14d0260 100644 (file)
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -3263,10 +3263,14 @@ xfs_bmap_btalloc_select_lengths(
 }
 
 /* Update all inode and quota accounting for the allocation we just did. */
-static void
-xfs_bmap_btalloc_accounting(
+void
+xfs_bmap_alloc_account(
        struct xfs_bmalloca     *ap)
 {
+       bool                    isrt = XFS_IS_REALTIME_INODE(ap->ip) &&
+                                       (ap->flags & XFS_BMAPI_ATTRFORK);
+       uint                    fld;
+
        if (ap->flags & XFS_BMAPI_COWFORK) {
                /*
                 * COW fork blocks are in-core only and thus are treated as
@@ -3291,7 +3295,8 @@ xfs_bmap_btalloc_accounting(
                 * to that of a delalloc extent.
                 */
                ap->ip->i_delayed_blks += ap->length;
-               xfs_trans_mod_dquot_byino(ap->tp, ap->ip, XFS_TRANS_DQ_RES_BLKS,
+               xfs_trans_mod_dquot_byino(ap->tp, ap->ip, isrt ?
+                               XFS_TRANS_DQ_RES_RTBLKS : XFS_TRANS_DQ_RES_BLKS,
                                -(long)ap->length);
                return;
        }
@@ -3302,10 +3307,12 @@ xfs_bmap_btalloc_accounting(
        if (ap->wasdel) {
                ap->ip->i_delayed_blks -= ap->length;
                xfs_mod_delalloc(ap->ip->i_mount, -(int64_t)ap->length);
+               fld = isrt ? XFS_TRANS_DQ_DELRTBCOUNT : XFS_TRANS_DQ_DELBCOUNT;
+       } else {
+               fld = isrt ? XFS_TRANS_DQ_RTBCOUNT : XFS_TRANS_DQ_BCOUNT;
        }
-       xfs_trans_mod_dquot_byino(ap->tp, ap->ip,
-               ap->wasdel ? XFS_TRANS_DQ_DELBCOUNT : XFS_TRANS_DQ_BCOUNT,
-               ap->length);
+
+       xfs_trans_mod_dquot_byino(ap->tp, ap->ip, fld, ap->length);
 }
 
 static int
@@ -3379,7 +3386,7 @@ xfs_bmap_process_allocated_extent(
                ap->offset = orig_offset;
        else if (ap->offset + ap->length < orig_offset + orig_length)
                ap->offset = orig_offset + orig_length - ap->length;
-       xfs_bmap_btalloc_accounting(ap);
+       xfs_bmap_alloc_account(ap);
 }
 
 #ifdef DEBUG

diff --git a/fs/xfs/libxfs/xfs_bmap.h b/fs/xfs/libxfs/xfs_bmap.h
index 4b83f6148e0071c00c9d88744c2d60261c991fd4..f6b73f1bad5f742f9aa2e832594122543c1376a6 100644 (file)
--- a/fs/xfs/libxfs/xfs_bmap.h
+++ b/fs/xfs/libxfs/xfs_bmap.h
@@ -116,6 +116,8 @@ static inline int xfs_bmapi_whichfork(uint32_t bmapi_flags)
        return XFS_DATA_FORK;
 }
 
+void xfs_bmap_alloc_account(struct xfs_bmalloca *ap);
+
 /*
  * Special values for xfs_bmbt_irec_t br_startblock field.
  */

diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
index 731260a5af6db43d06849d32a7384a90188f4031..d6432a7ef2857dd694acaba6f8c875066004f6a1 100644 (file)
--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -168,17 +168,7 @@ xfs_bmap_rtalloc(
        if (rtx != NULLRTEXTNO) {
                ap->blkno = xfs_rtx_to_rtb(mp, rtx);
                ap->length = xfs_rtxlen_to_extlen(mp, ralen);
-               ap->ip->i_nblocks += ap->length;
-               xfs_trans_log_inode(ap->tp, ap->ip, XFS_ILOG_CORE);
-               if (ap->wasdel)
-                       ap->ip->i_delayed_blks -= ap->length;
-               /*
-                * Adjust the disk quota also. This was reserved
-                * earlier.
-                */
-               xfs_trans_mod_dquot_byino(ap->tp, ap->ip,
-                       ap->wasdel ? XFS_TRANS_DQ_DELRTBCOUNT :
-                                       XFS_TRANS_DQ_RTBCOUNT, ap->length);
+               xfs_bmap_alloc_account(ap);
                return 0;
        }