| Message ID | 20240930164211.2357358-8-hch@lst.de (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | [1/7] xfs: pass the exact range to initialize to xfs_initialize_perag | expand |
On Mon, Sep 30, 2024 at 06:41:48PM +0200, Christoph Hellwig wrote: > Split xfs_trans_mod_sb into separate helpers for the different counts. > While the icount and ifree counters get their own helpers, the handling > for fdblocks and frextents merges the delalloc and non-delalloc cases > to keep the related code together. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- Seems Ok, but not sure I see the point personally. Rather than a single helper with flags, we have multiple helpers, some of which still mix deltas via an incrementally harder to read boolean param. This seems sort of arbitrary to me. Is this to support some future work? Brian > fs/xfs/libxfs/xfs_ag_resv.c | 18 +++-- > fs/xfs/libxfs/xfs_ialloc.c | 14 ++-- > fs/xfs/libxfs/xfs_rtbitmap.c | 3 +- > fs/xfs/libxfs/xfs_shared.h | 10 --- > fs/xfs/xfs_fsops.c | 2 +- > fs/xfs/xfs_rtalloc.c | 6 +- > fs/xfs/xfs_trans.c | 130 +++++++++++++++-------------------- > fs/xfs/xfs_trans.h | 7 +- > fs/xfs/xfs_trans_dquot.c | 2 +- > 9 files changed, 82 insertions(+), 110 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_ag_resv.c b/fs/xfs/libxfs/xfs_ag_resv.c > index 216423df939e5c..bb518d6a2dcecd 100644 > --- a/fs/xfs/libxfs/xfs_ag_resv.c > +++ b/fs/xfs/libxfs/xfs_ag_resv.c > @@ -341,7 +341,6 @@ xfs_ag_resv_alloc_extent( > { > struct xfs_ag_resv *resv; > xfs_extlen_t len; > - uint field; > > trace_xfs_ag_resv_alloc_extent(pag, type, args->len); > > @@ -356,9 +355,8 @@ xfs_ag_resv_alloc_extent( > ASSERT(0); > fallthrough; > case XFS_AG_RESV_NONE: > - field = args->wasdel ? XFS_TRANS_SB_RES_FDBLOCKS : > - XFS_TRANS_SB_FDBLOCKS; > - xfs_trans_mod_sb(args->tp, field, -(int64_t)args->len); > + xfs_trans_mod_fdblocks(args->tp, -(int64_t)args->len, > + args->wasdel); > return; > } > > @@ -367,11 +365,11 @@ xfs_ag_resv_alloc_extent( > if (type == XFS_AG_RESV_RMAPBT) > return; > /* Allocations of reserved blocks only need on-disk sb updates... */ > - xfs_trans_mod_sb(args->tp, XFS_TRANS_SB_RES_FDBLOCKS, -(int64_t)len); > + xfs_trans_mod_fdblocks(args->tp, -(int64_t)len, true); > /* ...but non-reserved blocks need in-core and on-disk updates. */ > if (args->len > len) > - xfs_trans_mod_sb(args->tp, XFS_TRANS_SB_FDBLOCKS, > - -((int64_t)args->len - len)); > + xfs_trans_mod_fdblocks(args->tp, -((int64_t)args->len - len), > + false); > } > > /* Free a block to the reservation. */ > @@ -398,7 +396,7 @@ xfs_ag_resv_free_extent( > ASSERT(0); > fallthrough; > case XFS_AG_RESV_NONE: > - xfs_trans_mod_sb(tp, XFS_TRANS_SB_FDBLOCKS, (int64_t)len); > + xfs_trans_mod_fdblocks(tp, (int64_t)len, false); > fallthrough; > case XFS_AG_RESV_IGNORE: > return; > @@ -409,8 +407,8 @@ xfs_ag_resv_free_extent( > if (type == XFS_AG_RESV_RMAPBT) > return; > /* Freeing into the reserved pool only requires on-disk update... */ > - xfs_trans_mod_sb(tp, XFS_TRANS_SB_RES_FDBLOCKS, len); > + xfs_trans_mod_fdblocks(tp, len, true); > /* ...but freeing beyond that requires in-core and on-disk update. */ > if (len > leftover) > - xfs_trans_mod_sb(tp, XFS_TRANS_SB_FDBLOCKS, len - leftover); > + xfs_trans_mod_fdblocks(tp, len - leftover, false); > } > diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c > index 271855227514cb..ad28823debb6f1 100644 > --- a/fs/xfs/libxfs/xfs_ialloc.c > +++ b/fs/xfs/libxfs/xfs_ialloc.c > @@ -970,8 +970,8 @@ xfs_ialloc_ag_alloc( > /* > * Modify/log superblock values for inode count and inode free count. > */ > - xfs_trans_mod_sb(tp, XFS_TRANS_SB_ICOUNT, (long)newlen); > - xfs_trans_mod_sb(tp, XFS_TRANS_SB_IFREE, (long)newlen); > + xfs_trans_mod_icount(tp, (long)newlen); > + xfs_trans_mod_ifree(tp, (long)newlen); > return 0; > } > > @@ -1357,7 +1357,7 @@ xfs_dialloc_ag_inobt( > goto error0; > > xfs_btree_del_cursor(cur, XFS_BTREE_NOERROR); > - xfs_trans_mod_sb(tp, XFS_TRANS_SB_IFREE, -1); > + xfs_trans_mod_ifree(tp, -1); > *inop = ino; > return 0; > error1: > @@ -1660,7 +1660,7 @@ xfs_dialloc_ag( > xfs_ialloc_log_agi(tp, agbp, XFS_AGI_FREECOUNT); > pag->pagi_freecount--; > > - xfs_trans_mod_sb(tp, XFS_TRANS_SB_IFREE, -1); > + xfs_trans_mod_ifree(tp, -1); > > error = xfs_check_agi_freecount(icur); > if (error) > @@ -2139,8 +2139,8 @@ xfs_difree_inobt( > xfs_ialloc_log_agi(tp, agbp, XFS_AGI_COUNT | XFS_AGI_FREECOUNT); > pag->pagi_freecount -= ilen - 1; > pag->pagi_count -= ilen; > - xfs_trans_mod_sb(tp, XFS_TRANS_SB_ICOUNT, -ilen); > - xfs_trans_mod_sb(tp, XFS_TRANS_SB_IFREE, -(ilen - 1)); > + xfs_trans_mod_icount(tp, -ilen); > + xfs_trans_mod_ifree(tp, -(ilen - 1)); > > if ((error = xfs_btree_delete(cur, &i))) { > xfs_warn(mp, "%s: xfs_btree_delete returned error %d.", > @@ -2167,7 +2167,7 @@ xfs_difree_inobt( > be32_add_cpu(&agi->agi_freecount, 1); > xfs_ialloc_log_agi(tp, agbp, XFS_AGI_FREECOUNT); > pag->pagi_freecount++; > - xfs_trans_mod_sb(tp, XFS_TRANS_SB_IFREE, 1); > + xfs_trans_mod_ifree(tp, 1); > } > > error = xfs_check_agi_freecount(cur); > diff --git a/fs/xfs/libxfs/xfs_rtbitmap.c b/fs/xfs/libxfs/xfs_rtbitmap.c > index 27a4472402bacd..d0c693a69e0001 100644 > --- a/fs/xfs/libxfs/xfs_rtbitmap.c > +++ b/fs/xfs/libxfs/xfs_rtbitmap.c > @@ -989,7 +989,8 @@ xfs_rtfree_extent( > /* > * Mark more blocks free in the superblock. > */ > - xfs_trans_mod_sb(tp, XFS_TRANS_SB_FREXTENTS, (long)len); > + xfs_trans_mod_frextents(tp, (long)len, false); > + > /* > * If we've now freed all the blocks, reset the file sequence > * number to 0. > diff --git a/fs/xfs/libxfs/xfs_shared.h b/fs/xfs/libxfs/xfs_shared.h > index 45a32ea426164a..6b5a7bfc32dbb8 100644 > --- a/fs/xfs/libxfs/xfs_shared.h > +++ b/fs/xfs/libxfs/xfs_shared.h > @@ -140,16 +140,6 @@ void xfs_log_get_max_trans_res(struct xfs_mount *mp, > /* Transaction has locked the rtbitmap and rtsum inodes */ > #define XFS_TRANS_RTBITMAP_LOCKED (1u << 9) > > -/* > - * Field values for xfs_trans_mod_sb. > - */ > -#define XFS_TRANS_SB_ICOUNT 0x00000001 > -#define XFS_TRANS_SB_IFREE 0x00000002 > -#define XFS_TRANS_SB_FDBLOCKS 0x00000004 > -#define XFS_TRANS_SB_RES_FDBLOCKS 0x00000008 > -#define XFS_TRANS_SB_FREXTENTS 0x00000010 > -#define XFS_TRANS_SB_RES_FREXTENTS 0x00000020 > - > /* > * Here we centralize the specification of XFS meta-data buffer reference count > * values. This determines how hard the buffer cache tries to hold onto the > diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c > index 4168ccf21068cb..ac88a38c6cd522 100644 > --- a/fs/xfs/xfs_fsops.c > +++ b/fs/xfs/xfs_fsops.c > @@ -212,7 +212,7 @@ xfs_growfs_data_private( > goto out_trans_cancel; > > if (id.nfree) > - xfs_trans_mod_sb(tp, XFS_TRANS_SB_FDBLOCKS, id.nfree); > + xfs_trans_mod_fdblocks(tp, id.nfree, false); > > error = xfs_growfs_data_update_sb(tp, nagcount, nb, nagimax); > if (error) > diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c > index 994e5efedab20f..07f6008db322cb 100644 > --- a/fs/xfs/xfs_rtalloc.c > +++ b/fs/xfs/xfs_rtalloc.c > @@ -838,7 +838,7 @@ xfs_growfs_rt_bmblock( > xfs_rtbuf_cache_relse(&nargs); > if (error) > goto out_cancel; > - xfs_trans_mod_sb(args.tp, XFS_TRANS_SB_FREXTENTS, freed_rtx); > + xfs_trans_mod_frextents(args.tp, freed_rtx, false); > > error = xfs_growfs_rt_update_sb(args.tp, mp, nmp, freed_rtx); > if (error) > @@ -1335,9 +1335,7 @@ xfs_rtallocate( > if (error) > goto out_release; > > - xfs_trans_mod_sb(tp, wasdel ? > - XFS_TRANS_SB_RES_FREXTENTS : XFS_TRANS_SB_FREXTENTS, > - -(long)len); > + xfs_trans_mod_frextents(tp, -(long)len, wasdel); > *bno = xfs_rtx_to_rtb(args.mp, rtx); > *blen = xfs_rtxlen_to_extlen(args.mp, len); > > diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c > index 56505cb94f877d..fa133535235d4c 100644 > --- a/fs/xfs/xfs_trans.c > +++ b/fs/xfs/xfs_trans.c > @@ -334,48 +334,43 @@ xfs_trans_alloc_empty( > return xfs_trans_alloc(mp, &resv, 0, 0, XFS_TRANS_NO_WRITECOUNT, tpp); > } > > -/* > - * Record the indicated change to the given field for application > - * to the file system's superblock when the transaction commits. > - * For now, just store the change in the transaction structure. > - * > - * Mark the transaction structure to indicate that the superblock > - * needs to be updated before committing. > - * > - * Because we may not be keeping track of allocated/free inodes and > - * used filesystem blocks in the superblock, we do not mark the > - * superblock dirty in this transaction if we modify these fields. > - * We still need to update the transaction deltas so that they get > - * applied to the incore superblock, but we don't want them to > - * cause the superblock to get locked and logged if these are the > - * only fields in the superblock that the transaction modifies. > - */ > void > -xfs_trans_mod_sb( > - xfs_trans_t *tp, > - uint field, > - int64_t delta) > +xfs_trans_mod_icount( > + struct xfs_trans *tp, > + int64_t delta) > +{ > + tp->t_icount_delta += delta; > + tp->t_flags |= XFS_TRANS_DIRTY; > + if (!xfs_has_lazysbcount(tp->t_mountp)) > + tp->t_flags |= XFS_TRANS_SB_DIRTY; > +} > + > +void > +xfs_trans_mod_ifree( > + struct xfs_trans *tp, > + int64_t delta) > { > - uint32_t flags = (XFS_TRANS_DIRTY|XFS_TRANS_SB_DIRTY); > - xfs_mount_t *mp = tp->t_mountp; > - > - switch (field) { > - case XFS_TRANS_SB_ICOUNT: > - tp->t_icount_delta += delta; > - if (xfs_has_lazysbcount(mp)) > - flags &= ~XFS_TRANS_SB_DIRTY; > - break; > - case XFS_TRANS_SB_IFREE: > - tp->t_ifree_delta += delta; > - if (xfs_has_lazysbcount(mp)) > - flags &= ~XFS_TRANS_SB_DIRTY; > - break; > - case XFS_TRANS_SB_FDBLOCKS: > + tp->t_ifree_delta += delta; > + tp->t_flags |= XFS_TRANS_DIRTY; > + if (!xfs_has_lazysbcount(tp->t_mountp)) > + tp->t_flags |= XFS_TRANS_SB_DIRTY; > +} > + > +void > +xfs_trans_mod_fdblocks( > + struct xfs_trans *tp, > + int64_t delta, > + bool wasdel) > +{ > + struct xfs_mount *mp = tp->t_mountp; > + > + if (wasdel) { > /* > - * Track the number of blocks allocated in the transaction. > - * Make sure it does not exceed the number reserved. If so, > - * shutdown as this can lead to accounting inconsistency. > + * The allocation has already been applied to the in-core > + * counter, only apply it to the on-disk superblock. > */ > + tp->t_res_fdblocks_delta += delta; > + } else { > if (delta < 0) { > tp->t_blk_res_used += (uint)-delta; > if (tp->t_blk_res_used > tp->t_blk_res) > @@ -396,55 +391,40 @@ xfs_trans_mod_sb( > delta -= blkres_delta; > } > tp->t_fdblocks_delta += delta; > - if (xfs_has_lazysbcount(mp)) > - flags &= ~XFS_TRANS_SB_DIRTY; > - break; > - case XFS_TRANS_SB_RES_FDBLOCKS: > - /* > - * The allocation has already been applied to the > - * in-core superblock's counter. This should only > - * be applied to the on-disk superblock. > - */ > - tp->t_res_fdblocks_delta += delta; > - if (xfs_has_lazysbcount(mp)) > - flags &= ~XFS_TRANS_SB_DIRTY; > - break; > - case XFS_TRANS_SB_FREXTENTS: > + } > + > + tp->t_flags |= XFS_TRANS_DIRTY; > + if (!xfs_has_lazysbcount(mp)) > + tp->t_flags |= XFS_TRANS_SB_DIRTY; > +} > + > +void > +xfs_trans_mod_frextents( > + struct xfs_trans *tp, > + int64_t delta, > + bool wasdel) > +{ > + if (wasdel) { > /* > - * Track the number of blocks allocated in the > - * transaction. Make sure it does not exceed the > - * number reserved. > + * The allocation has already been applied to the in-core > + * counter, only apply it to the on-disk superblock. > */ > + ASSERT(delta < 0); > + tp->t_res_frextents_delta += delta; > + } else { > if (delta < 0) { > tp->t_rtx_res_used += (uint)-delta; > ASSERT(tp->t_rtx_res_used <= tp->t_rtx_res); > } > tp->t_frextents_delta += delta; > - break; > - case XFS_TRANS_SB_RES_FREXTENTS: > - /* > - * The allocation has already been applied to the > - * in-core superblock's counter. This should only > - * be applied to the on-disk superblock. > - */ > - ASSERT(delta < 0); > - tp->t_res_frextents_delta += delta; > - break; > - default: > - ASSERT(0); > - return; > } > > - tp->t_flags |= flags; > + tp->t_flags |= (XFS_TRANS_DIRTY | XFS_TRANS_SB_DIRTY); > } > > /* > - * xfs_trans_apply_sb_deltas() is called from the commit code > - * to bring the superblock buffer into the current transaction > - * and modify it as requested by earlier calls to xfs_trans_mod_sb(). > - * > - * For now we just look at each field allowed to change and change > - * it if necessary. > + * Called from the commit code to bring the superblock buffer into the current > + * transaction and modify it as based on earlier calls to xfs_trans_mod_*(). > */ > STATIC void > xfs_trans_apply_sb_deltas( > diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h > index e5911cf09be444..a2cee42368bd25 100644 > --- a/fs/xfs/xfs_trans.h > +++ b/fs/xfs/xfs_trans.h > @@ -162,7 +162,12 @@ int xfs_trans_reserve_more(struct xfs_trans *tp, > unsigned int blocks, unsigned int rtextents); > int xfs_trans_alloc_empty(struct xfs_mount *mp, > struct xfs_trans **tpp); > -void xfs_trans_mod_sb(xfs_trans_t *, uint, int64_t); > +void xfs_trans_mod_icount(struct xfs_trans *tp, int64_t delta); > +void xfs_trans_mod_ifree(struct xfs_trans *tp, int64_t delta); > +void xfs_trans_mod_fdblocks(struct xfs_trans *tp, int64_t delta, > + bool wasdel); > +void xfs_trans_mod_frextents(struct xfs_trans *tp, int64_t delta, > + bool wasdel); > > int xfs_trans_get_buf_map(struct xfs_trans *tp, struct xfs_buftarg *target, > struct xfs_buf_map *map, int nmaps, xfs_buf_flags_t flags, > diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c > index b368e13424c4f4..839eb1780d4694 100644 > --- a/fs/xfs/xfs_trans_dquot.c > +++ b/fs/xfs/xfs_trans_dquot.c > @@ -288,7 +288,7 @@ xfs_trans_get_dqtrx( > > /* > * Make the changes in the transaction structure. > - * The moral equivalent to xfs_trans_mod_sb(). > + * > * We don't touch any fields in the dquot, so we don't care > * if it's locked or not (most of the time it won't be). > */ > -- > 2.45.2 > >
On Thu, Oct 10, 2024 at 10:06:15AM -0400, Brian Foster wrote: > Seems Ok, but not sure I see the point personally. Rather than a single > helper with flags, we have multiple helpers, some of which still mix > deltas via an incrementally harder to read boolean param. This seems > sort of arbitrary to me. Is this to support some future work? I just find these multiplexers that have no common logic very confusing. And yes, I also have some changes to share more logic between the delalloc vs non-delalloc block accounting.
On Fri, Oct 11, 2024 at 09:54:08AM +0200, Christoph Hellwig wrote: > On Thu, Oct 10, 2024 at 10:06:15AM -0400, Brian Foster wrote: > > Seems Ok, but not sure I see the point personally. Rather than a single > > helper with flags, we have multiple helpers, some of which still mix > > deltas via an incrementally harder to read boolean param. This seems > > sort of arbitrary to me. Is this to support some future work? > > I just find these multiplexers that have no common logic very confusing. > > And yes, I also have some changes to share more logic between the > delalloc vs non-delalloc block accounting. > I'm not sure what you mean by no common logic. The original trans_mod_sb() is basically a big switch statement for modifying the appropriate transaction delta associated with a superblock field. That seems logical to me. Just to be clear, I don't really feel strongly about this one way or the other. I don't object and I don't think it makes anything worse, and it's less of a change if half this stuff goes away anyways by changing how the sb is logged. But I also think sometimes code seems more clear moreso because we go through the process of refactoring it (i.e. familiarity bias) over what the code ultimately looks like. *shrug* This is all subjective, I'm sure there are other opinions. Brian
On Fri, Oct 11, 2024 at 10:05:33AM -0400, Brian Foster wrote: > On Fri, Oct 11, 2024 at 09:54:08AM +0200, Christoph Hellwig wrote: > > On Thu, Oct 10, 2024 at 10:06:15AM -0400, Brian Foster wrote: > > > Seems Ok, but not sure I see the point personally. Rather than a single > > > helper with flags, we have multiple helpers, some of which still mix > > > deltas via an incrementally harder to read boolean param. This seems > > > sort of arbitrary to me. Is this to support some future work? > > > > I just find these multiplexers that have no common logic very confusing. > > > > And yes, I also have some changes to share more logic between the > > delalloc vs non-delalloc block accounting. > > > > I'm not sure what you mean by no common logic. The original > trans_mod_sb() is basically a big switch statement for modifying the > appropriate transaction delta associated with a superblock field. That > seems logical to me. > > Just to be clear, I don't really feel strongly about this one way or the > other. I don't object and I don't think it makes anything worse, and > it's less of a change if half this stuff goes away anyways by changing > how the sb is logged. But I also think sometimes code seems more clear > moreso because we go through the process of refactoring it (i.e. > familiarity bias) over what the code ultimately looks like. > > *shrug* This is all subjective, I'm sure there are other opinions. I'd rather have separate functions for each field, because xfs_trans_mod_sb is a giant dispatch function, with almost no shared logic save the tp->t_flags update at the end. I'm not in love with the 'wasdel' parameter name, but I don't have a better suggestion short of splitting them up into even more tiny functions: void xfs_trans_mod_res_fdblocks(struct xfs_trans *tp, int64_t delta); void xfs_trans_mod_fdblocks(struct xfs_trans *tp, int64_t delta); which is sort of gross since the callers already have a wasdel variable. Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > Brian > >
diff --git a/fs/xfs/libxfs/xfs_ag_resv.c b/fs/xfs/libxfs/xfs_ag_resv.c index 216423df939e5c..bb518d6a2dcecd 100644 --- a/fs/xfs/libxfs/xfs_ag_resv.c +++ b/fs/xfs/libxfs/xfs_ag_resv.c @@ -341,7 +341,6 @@ xfs_ag_resv_alloc_extent( { struct xfs_ag_resv *resv; xfs_extlen_t len; - uint field; trace_xfs_ag_resv_alloc_extent(pag, type, args->len); @@ -356,9 +355,8 @@ xfs_ag_resv_alloc_extent( ASSERT(0); fallthrough; case XFS_AG_RESV_NONE: - field = args->wasdel ? XFS_TRANS_SB_RES_FDBLOCKS : - XFS_TRANS_SB_FDBLOCKS; - xfs_trans_mod_sb(args->tp, field, -(int64_t)args->len); + xfs_trans_mod_fdblocks(args->tp, -(int64_t)args->len, + args->wasdel); return; } @@ -367,11 +365,11 @@ xfs_ag_resv_alloc_extent( if (type == XFS_AG_RESV_RMAPBT) return; /* Allocations of reserved blocks only need on-disk sb updates... */ - xfs_trans_mod_sb(args->tp, XFS_TRANS_SB_RES_FDBLOCKS, -(int64_t)len); + xfs_trans_mod_fdblocks(args->tp, -(int64_t)len, true); /* ...but non-reserved blocks need in-core and on-disk updates. */ if (args->len > len) - xfs_trans_mod_sb(args->tp, XFS_TRANS_SB_FDBLOCKS, - -((int64_t)args->len - len)); + xfs_trans_mod_fdblocks(args->tp, -((int64_t)args->len - len), + false); } /* Free a block to the reservation. */ @@ -398,7 +396,7 @@ xfs_ag_resv_free_extent( ASSERT(0); fallthrough; case XFS_AG_RESV_NONE: - xfs_trans_mod_sb(tp, XFS_TRANS_SB_FDBLOCKS, (int64_t)len); + xfs_trans_mod_fdblocks(tp, (int64_t)len, false); fallthrough; case XFS_AG_RESV_IGNORE: return; @@ -409,8 +407,8 @@ xfs_ag_resv_free_extent( if (type == XFS_AG_RESV_RMAPBT) return; /* Freeing into the reserved pool only requires on-disk update... */ - xfs_trans_mod_sb(tp, XFS_TRANS_SB_RES_FDBLOCKS, len); + xfs_trans_mod_fdblocks(tp, len, true); /* ...but freeing beyond that requires in-core and on-disk update. */ if (len > leftover) - xfs_trans_mod_sb(tp, XFS_TRANS_SB_FDBLOCKS, len - leftover); + xfs_trans_mod_fdblocks(tp, len - leftover, false); } diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c index 271855227514cb..ad28823debb6f1 100644 --- a/fs/xfs/libxfs/xfs_ialloc.c +++ b/fs/xfs/libxfs/xfs_ialloc.c @@ -970,8 +970,8 @@ xfs_ialloc_ag_alloc( /* * Modify/log superblock values for inode count and inode free count. */ - xfs_trans_mod_sb(tp, XFS_TRANS_SB_ICOUNT, (long)newlen); - xfs_trans_mod_sb(tp, XFS_TRANS_SB_IFREE, (long)newlen); + xfs_trans_mod_icount(tp, (long)newlen); + xfs_trans_mod_ifree(tp, (long)newlen); return 0; } @@ -1357,7 +1357,7 @@ xfs_dialloc_ag_inobt( goto error0; xfs_btree_del_cursor(cur, XFS_BTREE_NOERROR); - xfs_trans_mod_sb(tp, XFS_TRANS_SB_IFREE, -1); + xfs_trans_mod_ifree(tp, -1); *inop = ino; return 0; error1: @@ -1660,7 +1660,7 @@ xfs_dialloc_ag( xfs_ialloc_log_agi(tp, agbp, XFS_AGI_FREECOUNT); pag->pagi_freecount--; - xfs_trans_mod_sb(tp, XFS_TRANS_SB_IFREE, -1); + xfs_trans_mod_ifree(tp, -1); error = xfs_check_agi_freecount(icur); if (error) @@ -2139,8 +2139,8 @@ xfs_difree_inobt( xfs_ialloc_log_agi(tp, agbp, XFS_AGI_COUNT | XFS_AGI_FREECOUNT); pag->pagi_freecount -= ilen - 1; pag->pagi_count -= ilen; - xfs_trans_mod_sb(tp, XFS_TRANS_SB_ICOUNT, -ilen); - xfs_trans_mod_sb(tp, XFS_TRANS_SB_IFREE, -(ilen - 1)); + xfs_trans_mod_icount(tp, -ilen); + xfs_trans_mod_ifree(tp, -(ilen - 1)); if ((error = xfs_btree_delete(cur, &i))) { xfs_warn(mp, "%s: xfs_btree_delete returned error %d.", @@ -2167,7 +2167,7 @@ xfs_difree_inobt( be32_add_cpu(&agi->agi_freecount, 1); xfs_ialloc_log_agi(tp, agbp, XFS_AGI_FREECOUNT); pag->pagi_freecount++; - xfs_trans_mod_sb(tp, XFS_TRANS_SB_IFREE, 1); + xfs_trans_mod_ifree(tp, 1); } error = xfs_check_agi_freecount(cur); diff --git a/fs/xfs/libxfs/xfs_rtbitmap.c b/fs/xfs/libxfs/xfs_rtbitmap.c index 27a4472402bacd..d0c693a69e0001 100644 --- a/fs/xfs/libxfs/xfs_rtbitmap.c +++ b/fs/xfs/libxfs/xfs_rtbitmap.c @@ -989,7 +989,8 @@ xfs_rtfree_extent( /* * Mark more blocks free in the superblock. */ - xfs_trans_mod_sb(tp, XFS_TRANS_SB_FREXTENTS, (long)len); + xfs_trans_mod_frextents(tp, (long)len, false); + /* * If we've now freed all the blocks, reset the file sequence * number to 0. diff --git a/fs/xfs/libxfs/xfs_shared.h b/fs/xfs/libxfs/xfs_shared.h index 45a32ea426164a..6b5a7bfc32dbb8 100644 --- a/fs/xfs/libxfs/xfs_shared.h +++ b/fs/xfs/libxfs/xfs_shared.h @@ -140,16 +140,6 @@ void xfs_log_get_max_trans_res(struct xfs_mount *mp, /* Transaction has locked the rtbitmap and rtsum inodes */ #define XFS_TRANS_RTBITMAP_LOCKED (1u << 9) -/* - * Field values for xfs_trans_mod_sb. - */ -#define XFS_TRANS_SB_ICOUNT 0x00000001 -#define XFS_TRANS_SB_IFREE 0x00000002 -#define XFS_TRANS_SB_FDBLOCKS 0x00000004 -#define XFS_TRANS_SB_RES_FDBLOCKS 0x00000008 -#define XFS_TRANS_SB_FREXTENTS 0x00000010 -#define XFS_TRANS_SB_RES_FREXTENTS 0x00000020 - /* * Here we centralize the specification of XFS meta-data buffer reference count * values. This determines how hard the buffer cache tries to hold onto the diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c index 4168ccf21068cb..ac88a38c6cd522 100644 --- a/fs/xfs/xfs_fsops.c +++ b/fs/xfs/xfs_fsops.c @@ -212,7 +212,7 @@ xfs_growfs_data_private( goto out_trans_cancel; if (id.nfree) - xfs_trans_mod_sb(tp, XFS_TRANS_SB_FDBLOCKS, id.nfree); + xfs_trans_mod_fdblocks(tp, id.nfree, false); error = xfs_growfs_data_update_sb(tp, nagcount, nb, nagimax); if (error) diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c index 994e5efedab20f..07f6008db322cb 100644 --- a/fs/xfs/xfs_rtalloc.c +++ b/fs/xfs/xfs_rtalloc.c @@ -838,7 +838,7 @@ xfs_growfs_rt_bmblock( xfs_rtbuf_cache_relse(&nargs); if (error) goto out_cancel; - xfs_trans_mod_sb(args.tp, XFS_TRANS_SB_FREXTENTS, freed_rtx); + xfs_trans_mod_frextents(args.tp, freed_rtx, false); error = xfs_growfs_rt_update_sb(args.tp, mp, nmp, freed_rtx); if (error) @@ -1335,9 +1335,7 @@ xfs_rtallocate( if (error) goto out_release; - xfs_trans_mod_sb(tp, wasdel ? - XFS_TRANS_SB_RES_FREXTENTS : XFS_TRANS_SB_FREXTENTS, - -(long)len); + xfs_trans_mod_frextents(tp, -(long)len, wasdel); *bno = xfs_rtx_to_rtb(args.mp, rtx); *blen = xfs_rtxlen_to_extlen(args.mp, len); diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c index 56505cb94f877d..fa133535235d4c 100644 --- a/fs/xfs/xfs_trans.c +++ b/fs/xfs/xfs_trans.c @@ -334,48 +334,43 @@ xfs_trans_alloc_empty( return xfs_trans_alloc(mp, &resv, 0, 0, XFS_TRANS_NO_WRITECOUNT, tpp); } -/* - * Record the indicated change to the given field for application - * to the file system's superblock when the transaction commits. - * For now, just store the change in the transaction structure. - * - * Mark the transaction structure to indicate that the superblock - * needs to be updated before committing. - * - * Because we may not be keeping track of allocated/free inodes and - * used filesystem blocks in the superblock, we do not mark the - * superblock dirty in this transaction if we modify these fields. - * We still need to update the transaction deltas so that they get - * applied to the incore superblock, but we don't want them to - * cause the superblock to get locked and logged if these are the - * only fields in the superblock that the transaction modifies. - */ void -xfs_trans_mod_sb( - xfs_trans_t *tp, - uint field, - int64_t delta) +xfs_trans_mod_icount( + struct xfs_trans *tp, + int64_t delta) +{ + tp->t_icount_delta += delta; + tp->t_flags |= XFS_TRANS_DIRTY; + if (!xfs_has_lazysbcount(tp->t_mountp)) + tp->t_flags |= XFS_TRANS_SB_DIRTY; +} + +void +xfs_trans_mod_ifree( + struct xfs_trans *tp, + int64_t delta) { - uint32_t flags = (XFS_TRANS_DIRTY|XFS_TRANS_SB_DIRTY); - xfs_mount_t *mp = tp->t_mountp; - - switch (field) { - case XFS_TRANS_SB_ICOUNT: - tp->t_icount_delta += delta; - if (xfs_has_lazysbcount(mp)) - flags &= ~XFS_TRANS_SB_DIRTY; - break; - case XFS_TRANS_SB_IFREE: - tp->t_ifree_delta += delta; - if (xfs_has_lazysbcount(mp)) - flags &= ~XFS_TRANS_SB_DIRTY; - break; - case XFS_TRANS_SB_FDBLOCKS: + tp->t_ifree_delta += delta; + tp->t_flags |= XFS_TRANS_DIRTY; + if (!xfs_has_lazysbcount(tp->t_mountp)) + tp->t_flags |= XFS_TRANS_SB_DIRTY; +} + +void +xfs_trans_mod_fdblocks( + struct xfs_trans *tp, + int64_t delta, + bool wasdel) +{ + struct xfs_mount *mp = tp->t_mountp; + + if (wasdel) { /* - * Track the number of blocks allocated in the transaction. - * Make sure it does not exceed the number reserved. If so, - * shutdown as this can lead to accounting inconsistency. + * The allocation has already been applied to the in-core + * counter, only apply it to the on-disk superblock. */ + tp->t_res_fdblocks_delta += delta; + } else { if (delta < 0) { tp->t_blk_res_used += (uint)-delta; if (tp->t_blk_res_used > tp->t_blk_res) @@ -396,55 +391,40 @@ xfs_trans_mod_sb( delta -= blkres_delta; } tp->t_fdblocks_delta += delta; - if (xfs_has_lazysbcount(mp)) - flags &= ~XFS_TRANS_SB_DIRTY; - break; - case XFS_TRANS_SB_RES_FDBLOCKS: - /* - * The allocation has already been applied to the - * in-core superblock's counter. This should only - * be applied to the on-disk superblock. - */ - tp->t_res_fdblocks_delta += delta; - if (xfs_has_lazysbcount(mp)) - flags &= ~XFS_TRANS_SB_DIRTY; - break; - case XFS_TRANS_SB_FREXTENTS: + } + + tp->t_flags |= XFS_TRANS_DIRTY; + if (!xfs_has_lazysbcount(mp)) + tp->t_flags |= XFS_TRANS_SB_DIRTY; +} + +void +xfs_trans_mod_frextents( + struct xfs_trans *tp, + int64_t delta, + bool wasdel) +{ + if (wasdel) { /* - * Track the number of blocks allocated in the - * transaction. Make sure it does not exceed the - * number reserved. + * The allocation has already been applied to the in-core + * counter, only apply it to the on-disk superblock. */ + ASSERT(delta < 0); + tp->t_res_frextents_delta += delta; + } else { if (delta < 0) { tp->t_rtx_res_used += (uint)-delta; ASSERT(tp->t_rtx_res_used <= tp->t_rtx_res); } tp->t_frextents_delta += delta; - break; - case XFS_TRANS_SB_RES_FREXTENTS: - /* - * The allocation has already been applied to the - * in-core superblock's counter. This should only - * be applied to the on-disk superblock. - */ - ASSERT(delta < 0); - tp->t_res_frextents_delta += delta; - break; - default: - ASSERT(0); - return; } - tp->t_flags |= flags; + tp->t_flags |= (XFS_TRANS_DIRTY | XFS_TRANS_SB_DIRTY); } /* - * xfs_trans_apply_sb_deltas() is called from the commit code - * to bring the superblock buffer into the current transaction - * and modify it as requested by earlier calls to xfs_trans_mod_sb(). - * - * For now we just look at each field allowed to change and change - * it if necessary. + * Called from the commit code to bring the superblock buffer into the current + * transaction and modify it as based on earlier calls to xfs_trans_mod_*(). */ STATIC void xfs_trans_apply_sb_deltas( diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h index e5911cf09be444..a2cee42368bd25 100644 --- a/fs/xfs/xfs_trans.h +++ b/fs/xfs/xfs_trans.h @@ -162,7 +162,12 @@ int xfs_trans_reserve_more(struct xfs_trans *tp, unsigned int blocks, unsigned int rtextents); int xfs_trans_alloc_empty(struct xfs_mount *mp, struct xfs_trans **tpp); -void xfs_trans_mod_sb(xfs_trans_t *, uint, int64_t); +void xfs_trans_mod_icount(struct xfs_trans *tp, int64_t delta); +void xfs_trans_mod_ifree(struct xfs_trans *tp, int64_t delta); +void xfs_trans_mod_fdblocks(struct xfs_trans *tp, int64_t delta, + bool wasdel); +void xfs_trans_mod_frextents(struct xfs_trans *tp, int64_t delta, + bool wasdel); int xfs_trans_get_buf_map(struct xfs_trans *tp, struct xfs_buftarg *target, struct xfs_buf_map *map, int nmaps, xfs_buf_flags_t flags, diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c index b368e13424c4f4..839eb1780d4694 100644 --- a/fs/xfs/xfs_trans_dquot.c +++ b/fs/xfs/xfs_trans_dquot.c @@ -288,7 +288,7 @@ xfs_trans_get_dqtrx( /* * Make the changes in the transaction structure. - * The moral equivalent to xfs_trans_mod_sb(). + * * We don't touch any fields in the dquot, so we don't care * if it's locked or not (most of the time it won't be). */
Split xfs_trans_mod_sb into separate helpers for the different counts. While the icount and ifree counters get their own helpers, the handling for fdblocks and frextents merges the delalloc and non-delalloc cases to keep the related code together. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/xfs/libxfs/xfs_ag_resv.c | 18 +++-- fs/xfs/libxfs/xfs_ialloc.c | 14 ++-- fs/xfs/libxfs/xfs_rtbitmap.c | 3 +- fs/xfs/libxfs/xfs_shared.h | 10 --- fs/xfs/xfs_fsops.c | 2 +- fs/xfs/xfs_rtalloc.c | 6 +- fs/xfs/xfs_trans.c | 130 +++++++++++++++-------------------- fs/xfs/xfs_trans.h | 7 +- fs/xfs/xfs_trans_dquot.c | 2 +- 9 files changed, 82 insertions(+), 110 deletions(-)