[PATCH 039/119] xfs: add rmap btree insert and delete helpers

[Brian Foster]

On Wed, Jul 13, 2016 at 11:37:04AM -0700, Darrick J. Wong wrote:
> On Wed, Jul 13, 2016 at 02:28:13PM -0400, Brian Foster wrote:
> > On Thu, Jun 16, 2016 at 06:22:02PM -0700, Darrick J. Wong wrote:
> > > Add a couple of helper functions to encapsulate rmap btree insert and
> > > delete operations.  Add tracepoints to the update function.
> > > 
> > > Signed-off-by: Darrick J. Wong <darrick.wong at oracle.com>
> > > Reviewed-by: Dave Chinner <dchinner at redhat.com>
> > > Signed-off-by: Dave Chinner <david at fromorbit.com>
> > > ---
> > >  fs/xfs/libxfs/xfs_rmap.c       |   78 +++++++++++++++++++++++++++++++++++++++-
> > >  fs/xfs/libxfs/xfs_rmap_btree.h |    3 ++
> > >  2 files changed, 80 insertions(+), 1 deletion(-)
> > > 
> > > 
> > > diff --git a/fs/xfs/libxfs/xfs_rmap.c b/fs/xfs/libxfs/xfs_rmap.c
> > > index 53ba14e..f92eaa1 100644
> > > --- a/fs/xfs/libxfs/xfs_rmap.c
> > > +++ b/fs/xfs/libxfs/xfs_rmap.c
> > > @@ -92,13 +92,89 @@ xfs_rmap_update(
> > ...
> > > +STATIC int
> > > +xfs_rmapbt_delete(
> > 
> > This throws an unused warning that persists to the end of the rmap
> > patches..?
> 
> Oh, yeah, we don't need it until "xfs: use interval query for rmap alloc
> operations on shared files".  Will move.
> 

Ok, with that snipped out:

Reviewed-by: Brian Foster <bfoster at redhat.com>

> --D
> 
> > 
> > Brian
> > 
> > > +	struct xfs_btree_cur	*rcur,
> > > +	xfs_agblock_t		agbno,
> > > +	xfs_extlen_t		len,
> > > +	uint64_t		owner,
> > > +	uint64_t		offset,
> > > +	unsigned int		flags)
> > > +{
> > > +	int			i;
> > > +	int			error;
> > > +
> > > +	trace_xfs_rmapbt_delete(rcur->bc_mp, rcur->bc_private.a.agno, agbno,
> > > +			len, owner, offset, flags);
> > > +
> > > +	error = xfs_rmap_lookup_eq(rcur, agbno, len, owner, offset, flags, &i);
> > > +	if (error)
> > > +		goto done;
> > > +	XFS_WANT_CORRUPTED_GOTO(rcur->bc_mp, i == 1, done);
> > > +
> > > +	error = xfs_btree_delete(rcur, &i);
> > > +	if (error)
> > > +		goto done;
> > > +	XFS_WANT_CORRUPTED_GOTO(rcur->bc_mp, i == 1, done);
> > > +done:
> > > +	if (error)
> > > +		trace_xfs_rmapbt_delete_error(rcur->bc_mp,
> > > +				rcur->bc_private.a.agno, error, _RET_IP_);
> > > +	return error;
> > >  }
> > >  
> > >  static int
> > > diff --git a/fs/xfs/libxfs/xfs_rmap_btree.h b/fs/xfs/libxfs/xfs_rmap_btree.h
> > > index 9d92da5..6674340 100644
> > > --- a/fs/xfs/libxfs/xfs_rmap_btree.h
> > > +++ b/fs/xfs/libxfs/xfs_rmap_btree.h
> > > @@ -64,6 +64,9 @@ int xfs_rmap_lookup_le(struct xfs_btree_cur *cur, xfs_agblock_t bno,
> > >  int xfs_rmap_lookup_eq(struct xfs_btree_cur *cur, xfs_agblock_t bno,
> > >  		xfs_extlen_t len, uint64_t owner, uint64_t offset,
> > >  		unsigned int flags, int *stat);
> > > +int xfs_rmapbt_insert(struct xfs_btree_cur *rcur, xfs_agblock_t agbno,
> > > +		xfs_extlen_t len, uint64_t owner, uint64_t offset,
> > > +		unsigned int flags);
> > >  int xfs_rmap_get_rec(struct xfs_btree_cur *cur, struct xfs_rmap_irec *irec,
> > >  		int *stat);
> > >  
> > > 
> > > _______________________________________________
> > > xfs mailing list
> > > xfs at oss.sgi.com
> > > http://oss.sgi.com/mailman/listinfo/xfs
> > 
> > _______________________________________________
> > xfs mailing list
> > xfs at oss.sgi.com
> > http://oss.sgi.com/mailman/listinfo/xfs