xfs: refactor delalloc accounting in xfs_bmap_add_extent_delay_real

Source kernel commit: ca1862b0838604aa048120d87ebbf53cf7c8c8bd

Account for all changes to the delalloc reservation in da_new, and use a
single call xfs_mod_fdblocks to reserve/free blocks, including always
checking for an error.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c
index de4b213557e552526be5c80bd3cee83f38b9d612..0c4a839d7de4bad33c2f8e123c1e7ae3ed66390c 100644 (file)
--- a/libxfs/xfs_bmap.c
+++ b/libxfs/xfs_bmap.c
@@ -1565,7 +1565,6 @@ xfs_bmap_add_extent_delay_real(
        int                     whichfork)
 {
        struct xfs_bmbt_irec    *new = &bma->got;
-       int                     diff;   /* temp value */
        int                     error;  /* error return value */
        int                     i;      /* temp state */
        xfs_ifork_t             *ifp;   /* inode fork pointer */
@@ -2063,17 +2062,6 @@ xfs_bmap_add_extent_delay_real(
 
                da_new = startblockval(PREV.br_startblock) +
                         startblockval(RIGHT.br_startblock);
-               diff = da_new - startblockval(old.br_startblock);
-               if (bma->cur)
-                       diff += bma->cur->bc_private.b.allocated;
-               if (diff > 0) {
-                       error = xfs_mod_fdblocks(bma->ip->i_mount,
-                                                -((int64_t)diff), false);
-                       ASSERT(!error);
-                       if (error)
-                               goto done;
-               }
-
                bma->idx++;
                break;
 
@@ -2108,19 +2096,17 @@ xfs_bmap_add_extent_delay_real(
                        goto done;
        }
 
-       /* adjust for changes in reserved delayed indirect blocks */
-       if (da_old || da_new) {
-               temp = da_new;
-               if (bma->cur)
-                       temp += bma->cur->bc_private.b.allocated;
-               if (temp < da_old)
-                       xfs_mod_fdblocks(bma->ip->i_mount,
-                                       (int64_t)(da_old - temp), false);
+       if (bma->cur) {
+               da_new += bma->cur->bc_private.b.allocated;
+               bma->cur->bc_private.b.allocated = 0;
        }
 
-       /* clear out the allocated field, done with it now in any case. */
-       if (bma->cur)
-               bma->cur->bc_private.b.allocated = 0;
+       /* adjust for changes in reserved delayed indirect blocks */
+       if (da_new != da_old) {
+               ASSERT(state == 0 || da_new < da_old);
+               error = xfs_mod_fdblocks(mp, (int64_t)(da_old - da_new),
+                               false);
+       }
 
        xfs_bmap_check_leaf_extents(bma->cur, bma->ip, whichfork);
 done: