xfs: refactor xfs_del_extent_real

Use xfs_iext_update_extent to update entries in the in-core extent list.
This isolates the function from the detailed layout of the extent list,
and generally makes the code a lot more readable.

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>

diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index fc052efb52f9d7c086ff749299dff82f8fe46eea..6d1efe387cf038bdbcf027445c83511117ea0807 100644 (file)
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -5076,10 +5076,9 @@ xfs_bmap_del_extent_real(
        xfs_fsblock_t           del_endblock=0; /* first block past del */
        xfs_fileoff_t           del_endoff;     /* first offset past del */
        int                     do_fx;  /* free extent at end of routine */
-       xfs_bmbt_rec_host_t     *ep;    /* current extent entry pointer */
        int                     error;  /* error return value */
        int                     flags = 0;/* inode logging flags */
-       xfs_bmbt_irec_t         got;    /* current extent entry */
+       struct xfs_bmbt_irec    got;    /* current extent entry */
        xfs_fileoff_t           got_endoff;     /* first offset past got */
        int                     i;      /* temp state */
        xfs_ifork_t             *ifp;   /* inode fork pointer */
@@ -5088,9 +5087,8 @@ xfs_bmap_del_extent_real(
        xfs_bmbt_irec_t         new;    /* new record to be inserted */
        /* REFERENCED */
        uint                    qfield; /* quota field to update */
-       xfs_filblks_t           temp;   /* for indirect length calculations */
-       xfs_filblks_t           temp2;  /* for indirect length calculations */
        int                     state = 0;
+       struct xfs_bmbt_irec    old;
 
        mp = ip->i_mount;
        XFS_STATS_INC(mp, xs_del_exlist);
@@ -5103,8 +5101,7 @@ xfs_bmap_del_extent_real(
        ifp = XFS_IFORK_PTR(ip, whichfork);
        ASSERT((*idx >= 0) && (*idx < xfs_iext_count(ifp)));
        ASSERT(del->br_blockcount > 0);
-       ep = xfs_iext_get_ext(ifp, *idx);
-       xfs_bmbt_get_all(ep, &got);
+       xfs_iext_get_extent(ifp, *idx, &got);
        ASSERT(got.br_startoff <= del->br_startoff);
        del_endoff = del->br_startoff + del->br_blockcount;
        got_endoff = got.br_startoff + got.br_blockcount;
@@ -5191,54 +5188,56 @@ xfs_bmap_del_extent_real(
                 * Deleting the first part of the extent.
                 */
                trace_xfs_bmap_pre_update(ip, *idx, state, _THIS_IP_);
-               xfs_bmbt_set_startoff(ep, del_endoff);
-               temp = got.br_blockcount - del->br_blockcount;
-               xfs_bmbt_set_blockcount(ep, temp);
-               xfs_bmbt_set_startblock(ep, del_endblock);
+               got.br_startoff = del_endoff;
+               got.br_startblock = del_endblock;
+               got.br_blockcount -= del->br_blockcount;
+               xfs_iext_update_extent(ifp, *idx, &got);
                trace_xfs_bmap_post_update(ip, *idx, state, _THIS_IP_);
                if (!cur) {
                        flags |= xfs_ilog_fext(whichfork);
                        break;
                }
-               if ((error = xfs_bmbt_update(cur, del_endoff, del_endblock,
-                               got.br_blockcount - del->br_blockcount,
-                               got.br_state)))
+               error = xfs_bmbt_update(cur, got.br_startoff, got.br_startblock,
+                               got.br_blockcount, got.br_state);
+               if (error)
                        goto done;
                break;
        case BMAP_RIGHT_FILLING:
                /*
                 * Deleting the last part of the extent.
                 */
-               temp = got.br_blockcount - del->br_blockcount;
                trace_xfs_bmap_pre_update(ip, *idx, state, _THIS_IP_);
-               xfs_bmbt_set_blockcount(ep, temp);
+               got.br_blockcount -= del->br_blockcount;
+               xfs_iext_update_extent(ifp, *idx, &got);
                trace_xfs_bmap_post_update(ip, *idx, state, _THIS_IP_);
                if (!cur) {
                        flags |= xfs_ilog_fext(whichfork);
                        break;
                }
-               if ((error = xfs_bmbt_update(cur, got.br_startoff,
-                               got.br_startblock,
-                               got.br_blockcount - del->br_blockcount,
-                               got.br_state)))
+               error = xfs_bmbt_update(cur, got.br_startoff, got.br_startblock,
+                               got.br_blockcount, got.br_state);
+               if (error)
                        goto done;
                break;
        case 0:
                /*
                 * Deleting the middle of the extent.
                 */
-               temp = del->br_startoff - got.br_startoff;
                trace_xfs_bmap_pre_update(ip, *idx, state, _THIS_IP_);
-               xfs_bmbt_set_blockcount(ep, temp);
+
+               old = got;
+               got.br_blockcount = del->br_startoff - got.br_startoff;
+               xfs_iext_update_extent(ifp, *idx, &got);
+
                new.br_startoff = del_endoff;
-               temp2 = got_endoff - del_endoff;
-               new.br_blockcount = temp2;
+               new.br_blockcount = got_endoff - del_endoff;
                new.br_state = got.br_state;
                new.br_startblock = del_endblock;
+
                flags |= XFS_ILOG_CORE;
                if (cur) {
                        error = xfs_bmbt_update(cur, got.br_startoff,
-                                       got.br_startblock, temp,
+                                       got.br_startblock, got.br_blockcount,
                                        got.br_state);
                        if (error)
                                goto done;
@@ -5260,7 +5259,8 @@ xfs_bmap_del_extent_real(
                                 * insert operation.
                                 */
                                error = xfs_bmbt_lookup_eq(cur, got.br_startoff,
-                                               got.br_startblock, temp, &i);
+                                               got.br_startblock,
+                                               got.br_blockcount, &i);
                                if (error)
                                        goto done;
                                XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);
@@ -5268,17 +5268,17 @@ xfs_bmap_del_extent_real(
                                 * Update the btree record back
                                 * to the original value.
                                 */
-                               error = xfs_bmbt_update(cur, got.br_startoff,
-                                               got.br_startblock,
-                                               got.br_blockcount,
-                                               got.br_state);
+                               error = xfs_bmbt_update(cur, old.br_startoff,
+                                               old.br_startblock,
+                                               old.br_blockcount,
+                                               old.br_state);
                                if (error)
                                        goto done;
                                /*
                                 * Reset the extent record back
                                 * to the original value.
                                 */
-                               xfs_bmbt_set_blockcount(ep, got.br_blockcount);
+                               xfs_iext_update_extent(ifp, *idx, &old);
                                flags = 0;
                                error = -ENOSPC;
                                goto done;