From f717e151eb5447cc4931c0af4f97f8f80b24e694 Mon Sep 17 00:00:00 2001 From: Brian Foster Date: Thu, 4 Oct 2018 14:33:01 -0500 Subject: [PATCH] xfs: remove struct xfs_bmalloca dfops field Source kernel commit: 3e3673e3029c1dedf75a1688a5203d9550adf490 Now that bma.dfops is only assigned from ->t_dfops, replace all accesses to the former with the latter and remove the unnecessary field. This patch does not change behavior. Signed-off-by: Brian Foster Reviewed-by: Christoph Hellwig Reviewed-by: Darrick J. Wong Signed-off-by: Darrick J. Wong Signed-off-by: Eric Sandeen --- include/xfs_inode.h | 1 + libxfs/xfs_bmap.c | 30 +++++++++++++++--------------- libxfs/xfs_bmap.h | 1 - 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/xfs_inode.h b/include/xfs_inode.h index f573f23bf..46c17d8b9 100644 --- a/include/xfs_inode.h +++ b/include/xfs_inode.h @@ -15,6 +15,7 @@ struct xfs_trans; struct xfs_mount; struct xfs_inode_log_item; struct xfs_dir_ops; +struct xfs_defer_ops; /* * Inode interface. This fakes up a "VFS inode" to make the xfs_inode appear diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c index 2fbbba3b3..bf7be8f21 100644 --- a/libxfs/xfs_bmap.c +++ b/libxfs/xfs_bmap.c @@ -1797,7 +1797,7 @@ xfs_bmap_add_extent_delay_real( if (xfs_bmap_needs_btree(bma->ip, whichfork)) { error = xfs_bmap_extents_to_btree(bma->tp, bma->ip, - bma->firstblock, bma->dfops, + bma->firstblock, bma->tp->t_dfops, &bma->cur, 1, &tmp_rval, whichfork); rval |= tmp_rval; if (error) @@ -1875,7 +1875,7 @@ xfs_bmap_add_extent_delay_real( if (xfs_bmap_needs_btree(bma->ip, whichfork)) { error = xfs_bmap_extents_to_btree(bma->tp, bma->ip, - bma->firstblock, bma->dfops, &bma->cur, 1, + bma->firstblock, bma->tp->t_dfops, &bma->cur, 1, &tmp_rval, whichfork); rval |= tmp_rval; if (error) @@ -1956,8 +1956,8 @@ xfs_bmap_add_extent_delay_real( if (xfs_bmap_needs_btree(bma->ip, whichfork)) { error = xfs_bmap_extents_to_btree(bma->tp, bma->ip, - bma->firstblock, bma->dfops, &bma->cur, - 1, &tmp_rval, whichfork); + bma->firstblock, bma->tp->t_dfops, + &bma->cur, 1, &tmp_rval, whichfork); rval |= tmp_rval; if (error) goto done; @@ -1982,7 +1982,7 @@ xfs_bmap_add_extent_delay_real( /* add reverse mapping unless caller opted out */ if (!(bma->flags & XFS_BMAPI_NORMAP)) { - error = xfs_rmap_map_extent(mp, bma->dfops, bma->ip, + error = xfs_rmap_map_extent(mp, bma->tp->t_dfops, bma->ip, whichfork, new); if (error) goto done; @@ -1994,7 +1994,7 @@ xfs_bmap_add_extent_delay_real( ASSERT(bma->cur == NULL); error = xfs_bmap_extents_to_btree(bma->tp, bma->ip, - bma->firstblock, bma->dfops, &bma->cur, + bma->firstblock, bma->tp->t_dfops, &bma->cur, da_old > 0, &tmp_logflags, whichfork); bma->logflags |= tmp_logflags; if (error) @@ -3471,7 +3471,7 @@ xfs_bmap_btalloc( error = xfs_bmap_btalloc_nullfb(ap, &args, &blen); if (error) return error; - } else if (ap->dfops->dop_low) { + } else if (ap->tp->t_dfops->dop_low) { if (xfs_inode_is_filestream(ap->ip)) args.type = XFS_ALLOCTYPE_FIRST_AG; else @@ -3506,7 +3506,7 @@ xfs_bmap_btalloc( * is >= the stripe unit and the allocation offset is * at the end of file. */ - if (!ap->dfops->dop_low && ap->aeof) { + if (!ap->tp->t_dfops->dop_low && ap->aeof) { if (!ap->offset) { args.alignment = stripe_align; atype = args.type; @@ -3598,7 +3598,7 @@ xfs_bmap_btalloc( args.total = ap->minlen; if ((error = xfs_alloc_vextent(&args))) return error; - ap->dfops->dop_low = true; + ap->tp->t_dfops->dop_low = true; } if (args.fsbno != NULLFSBLOCK) { /* @@ -4073,7 +4073,7 @@ xfs_bmapi_allocate( if ((ifp->if_flags & XFS_IFBROOT) && !bma->cur) { bma->cur = xfs_bmbt_init_cursor(mp, bma->tp, bma->ip, whichfork); bma->cur->bc_private.b.firstblock = *bma->firstblock; - bma->cur->bc_private.b.dfops = bma->dfops; + bma->cur->bc_private.b.dfops = bma->tp->t_dfops; } /* * Bump the number of extents we've allocated @@ -4109,8 +4109,8 @@ xfs_bmapi_allocate( else error = xfs_bmap_add_extent_hole_real(bma->tp, bma->ip, whichfork, &bma->icur, &bma->cur, &bma->got, - bma->firstblock, bma->dfops, &bma->logflags, - bma->flags); + bma->firstblock, bma->tp->t_dfops, + &bma->logflags, bma->flags); bma->logflags |= tmp_logflags; if (error) @@ -4162,7 +4162,7 @@ xfs_bmapi_convert_unwritten( bma->cur = xfs_bmbt_init_cursor(bma->ip->i_mount, bma->tp, bma->ip, whichfork); bma->cur->bc_private.b.firstblock = *bma->firstblock; - bma->cur->bc_private.b.dfops = bma->dfops; + bma->cur->bc_private.b.dfops = bma->tp->t_dfops; } mval->br_state = (mval->br_state == XFS_EXT_UNWRITTEN) ? XFS_EXT_NORM : XFS_EXT_UNWRITTEN; @@ -4180,7 +4180,7 @@ xfs_bmapi_convert_unwritten( error = xfs_bmap_add_extent_unwritten_real(bma->tp, bma->ip, whichfork, &bma->icur, &bma->cur, mval, bma->firstblock, - bma->dfops, &tmp_logflags); + bma->tp->t_dfops, &tmp_logflags); /* * Log the inode core unconditionally in the unwritten extent conversion * path because the conversion might not have done so (e.g., if the @@ -4327,8 +4327,8 @@ xfs_bmapi_write( bma.ip = ip; bma.total = total; bma.datatype = 0; - bma.dfops = tp ? tp->t_dfops : NULL; bma.firstblock = firstblock; + ASSERT(!tp || tp->t_dfops); while (bno < end && n < *nmap) { bool need_alloc = false, wasdelay = false; diff --git a/libxfs/xfs_bmap.h b/libxfs/xfs_bmap.h index 2728e98e9..560235603 100644 --- a/libxfs/xfs_bmap.h +++ b/libxfs/xfs_bmap.h @@ -20,7 +20,6 @@ extern kmem_zone_t *xfs_bmap_free_item_zone; */ struct xfs_bmalloca { xfs_fsblock_t *firstblock; /* i/o first block allocated */ - struct xfs_defer_ops *dfops; /* bmap freelist */ struct xfs_trans *tp; /* transaction pointer */ struct xfs_inode *ip; /* incore inode pointer */ struct xfs_bmbt_irec prev; /* extent before the new one */ -- 2.47.2