| Message ID | 20170903072956.3175-11-hch@lst.de (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Sun, Sep 03, 2017 at 09:29:49AM +0200, Christoph Hellwig wrote: > 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> > fs/xfs/libxfs/xfs_bmap.c | 48 +++++++++++++++++++++--------------------------- > 1 file changed, 21 insertions(+), 27 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c > index eae66f7999c8..05d4778ce528 100644 > --- a/fs/xfs/libxfs/xfs_bmap.c > +++ b/fs/xfs/libxfs/xfs_bmap.c > @@ -2860,6 +2860,7 @@ xfs_bmap_add_extent_hole_real( > xfs_bmbt_irec_t right; /* right neighbor extent entry */ > int rval=0; /* return value (logging flags) */ > int state; /* state bits, accessed thru macros */ > + struct xfs_bmbt_irec old; > > ASSERT(*idx >= 0); > ASSERT(*idx <= xfs_iext_count(ifp)); > @@ -2929,9 +2930,8 @@ xfs_bmap_add_extent_hole_real( > */ > --*idx; > trace_xfs_bmap_pre_update(ip, *idx, state, _THIS_IP_); > - xfs_bmbt_set_blockcount(xfs_iext_get_ext(ifp, *idx), > - left.br_blockcount + new->br_blockcount + > - right.br_blockcount); > + left.br_blockcount += new->br_blockcount + right.br_blockcount; > + xfs_iext_update_extent(ifp, *idx, &left); > trace_xfs_bmap_post_update(ip, *idx, state, _THIS_IP_); > > xfs_iext_remove(ip, *idx + 1, 1, state); > @@ -2958,10 +2958,7 @@ xfs_bmap_add_extent_hole_real( > XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done); > error = xfs_bmbt_update(cur, left.br_startoff, > left.br_startblock, > - left.br_blockcount + > - new->br_blockcount + > - right.br_blockcount, > - left.br_state); > + left.br_blockcount, left.br_state); > if (error) > goto done; > } > @@ -2974,26 +2971,25 @@ xfs_bmap_add_extent_hole_real( > * Merge the new allocation with the left neighbor. > */ > --*idx; > + old = left; > trace_xfs_bmap_pre_update(ip, *idx, state, _THIS_IP_); > - xfs_bmbt_set_blockcount(xfs_iext_get_ext(ifp, *idx), > - left.br_blockcount + new->br_blockcount); > + left.br_blockcount += new->br_blockcount; > + xfs_iext_update_extent(ifp, *idx, &left); > trace_xfs_bmap_post_update(ip, *idx, state, _THIS_IP_); > > if (cur == NULL) { > rval = xfs_ilog_fext(whichfork); > } else { > rval = 0; > - error = xfs_bmbt_lookup_eq(cur, left.br_startoff, > - left.br_startblock, left.br_blockcount, > + error = xfs_bmbt_lookup_eq(cur, old.br_startoff, > + old.br_startblock, old.br_blockcount, > &i); > if (error) > goto done; > XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done); > error = xfs_bmbt_update(cur, left.br_startoff, > left.br_startblock, > - left.br_blockcount + > - new->br_blockcount, > - left.br_state); > + left.br_blockcount, left.br_state); > if (error) > goto done; > } > @@ -3005,29 +3001,27 @@ xfs_bmap_add_extent_hole_real( > * on the right. > * Merge the new allocation with the right neighbor. > */ > + old = right; > trace_xfs_bmap_pre_update(ip, *idx, state, _THIS_IP_); > - xfs_bmbt_set_allf(xfs_iext_get_ext(ifp, *idx), > - new->br_startoff, new->br_startblock, > - new->br_blockcount + right.br_blockcount, > - right.br_state); > + right.br_startoff = new->br_startoff; > + right.br_startblock = new->br_startblock; > + right.br_blockcount += new->br_blockcount; > + xfs_iext_update_extent(ifp, *idx, &right); > trace_xfs_bmap_post_update(ip, *idx, state, _THIS_IP_); > > if (cur == NULL) { > rval = xfs_ilog_fext(whichfork); > } else { > rval = 0; > - error = xfs_bmbt_lookup_eq(cur, > - right.br_startoff, > - right.br_startblock, > - right.br_blockcount, &i); > + error = xfs_bmbt_lookup_eq(cur, old.br_startoff, > + old.br_startblock, old.br_blockcount, > + &i); > if (error) > goto done; > XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done); > - error = xfs_bmbt_update(cur, new->br_startoff, > - new->br_startblock, > - new->br_blockcount + > - right.br_blockcount, > - right.br_state); > + error = xfs_bmbt_update(cur, right.br_startoff, > + right.br_startblock, > + right.br_blockcount, right.br_state); > if (error) > goto done; > } > -- > 2.11.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index eae66f7999c8..05d4778ce528 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -2860,6 +2860,7 @@ xfs_bmap_add_extent_hole_real( xfs_bmbt_irec_t right; /* right neighbor extent entry */ int rval=0; /* return value (logging flags) */ int state; /* state bits, accessed thru macros */ + struct xfs_bmbt_irec old; ASSERT(*idx >= 0); ASSERT(*idx <= xfs_iext_count(ifp)); @@ -2929,9 +2930,8 @@ xfs_bmap_add_extent_hole_real( */ --*idx; trace_xfs_bmap_pre_update(ip, *idx, state, _THIS_IP_); - xfs_bmbt_set_blockcount(xfs_iext_get_ext(ifp, *idx), - left.br_blockcount + new->br_blockcount + - right.br_blockcount); + left.br_blockcount += new->br_blockcount + right.br_blockcount; + xfs_iext_update_extent(ifp, *idx, &left); trace_xfs_bmap_post_update(ip, *idx, state, _THIS_IP_); xfs_iext_remove(ip, *idx + 1, 1, state); @@ -2958,10 +2958,7 @@ xfs_bmap_add_extent_hole_real( XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done); error = xfs_bmbt_update(cur, left.br_startoff, left.br_startblock, - left.br_blockcount + - new->br_blockcount + - right.br_blockcount, - left.br_state); + left.br_blockcount, left.br_state); if (error) goto done; } @@ -2974,26 +2971,25 @@ xfs_bmap_add_extent_hole_real( * Merge the new allocation with the left neighbor. */ --*idx; + old = left; trace_xfs_bmap_pre_update(ip, *idx, state, _THIS_IP_); - xfs_bmbt_set_blockcount(xfs_iext_get_ext(ifp, *idx), - left.br_blockcount + new->br_blockcount); + left.br_blockcount += new->br_blockcount; + xfs_iext_update_extent(ifp, *idx, &left); trace_xfs_bmap_post_update(ip, *idx, state, _THIS_IP_); if (cur == NULL) { rval = xfs_ilog_fext(whichfork); } else { rval = 0; - error = xfs_bmbt_lookup_eq(cur, left.br_startoff, - left.br_startblock, left.br_blockcount, + error = xfs_bmbt_lookup_eq(cur, old.br_startoff, + old.br_startblock, old.br_blockcount, &i); if (error) goto done; XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done); error = xfs_bmbt_update(cur, left.br_startoff, left.br_startblock, - left.br_blockcount + - new->br_blockcount, - left.br_state); + left.br_blockcount, left.br_state); if (error) goto done; } @@ -3005,29 +3001,27 @@ xfs_bmap_add_extent_hole_real( * on the right. * Merge the new allocation with the right neighbor. */ + old = right; trace_xfs_bmap_pre_update(ip, *idx, state, _THIS_IP_); - xfs_bmbt_set_allf(xfs_iext_get_ext(ifp, *idx), - new->br_startoff, new->br_startblock, - new->br_blockcount + right.br_blockcount, - right.br_state); + right.br_startoff = new->br_startoff; + right.br_startblock = new->br_startblock; + right.br_blockcount += new->br_blockcount; + xfs_iext_update_extent(ifp, *idx, &right); trace_xfs_bmap_post_update(ip, *idx, state, _THIS_IP_); if (cur == NULL) { rval = xfs_ilog_fext(whichfork); } else { rval = 0; - error = xfs_bmbt_lookup_eq(cur, - right.br_startoff, - right.br_startblock, - right.br_blockcount, &i); + error = xfs_bmbt_lookup_eq(cur, old.br_startoff, + old.br_startblock, old.br_blockcount, + &i); if (error) goto done; XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done); - error = xfs_bmbt_update(cur, new->br_startoff, - new->br_startblock, - new->br_blockcount + - right.br_blockcount, - right.br_state); + error = xfs_bmbt_update(cur, right.br_startoff, + right.br_startblock, + right.br_blockcount, right.br_state); if (error) goto done; }
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> --- fs/xfs/libxfs/xfs_bmap.c | 48 +++++++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 27 deletions(-)