Commit bac3f784 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: don't bother calling xfs_refcount_finish_one_cleanup in xfs_refcount_finish_one 



In xfs_refcount_finish_one we know the cursor is non-zero when calling
xfs_refcount_finish_one_cleanup and we pass a 0 error variable.  This
means xfs_refcount_finish_one_cleanup is just doing a
xfs_btree_del_cursor.

Open code that and move xfs_refcount_finish_one_cleanup to
fs/xfs/xfs_refcount_item.c.

Inspired-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 8aef7992

fs/xfs/libxfs/xfs_refcount.c

+1 −18
Original line number Diff line number Diff line
@@ -1300,23 +1300,6 @@ xfs_refcount_adjust( 
	return error;

}



/* Clean up after calling xfs_refcount_finish_one. */

void

xfs_refcount_finish_one_cleanup(

	struct xfs_trans	*tp,

	struct xfs_btree_cur	*rcur,

	int			error)

{

	struct xfs_buf		*agbp;



	if (rcur == NULL)

		return;

	agbp = rcur->bc_ag.agbp;

	xfs_btree_del_cursor(rcur, error);

	if (error)

		xfs_trans_brelse(tp, agbp);

}



/*

 * Set up a continuation a deferred refcount operation by updating the intent.

 * Checks to make sure we're not going to run off the end of the AG.
@@ -1380,7 +1363,7 @@ xfs_refcount_finish_one( 
	if (rcur != NULL && rcur->bc_ag.pag != ri->ri_pag) {

		nr_ops = rcur->bc_refc.nr_ops;

		shape_changes = rcur->bc_refc.shape_changes;

		xfs_refcount_finish_one_cleanup(tp, rcur, 0);

		xfs_btree_del_cursor(rcur, 0);

		rcur = NULL;

		*pcur = NULL;

	}

fs/xfs/libxfs/xfs_refcount.h

+0 −2
Original line number Diff line number Diff line
@@ -82,8 +82,6 @@ void xfs_refcount_increase_extent(struct xfs_trans *tp, 
void xfs_refcount_decrease_extent(struct xfs_trans *tp,

		struct xfs_bmbt_irec *irec);



extern void xfs_refcount_finish_one_cleanup(struct xfs_trans *tp,

		struct xfs_btree_cur *rcur, int error);

extern int xfs_refcount_finish_one(struct xfs_trans *tp,

		struct xfs_refcount_intent *ri, struct xfs_btree_cur **pcur);

fs/xfs/xfs_refcount_item.c

+18 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include "xfs_log_priv.h"

#include "xfs_log_recover.h"

#include "xfs_ag.h"

#include "xfs_btree.h"



struct kmem_cache	*xfs_cui_cache;

struct kmem_cache	*xfs_cud_cache;
@@ -369,6 +370,23 @@ xfs_refcount_update_finish_item( 
	return error;

}



/* Clean up after calling xfs_refcount_finish_one. */

STATIC void

xfs_refcount_finish_one_cleanup(

	struct xfs_trans	*tp,

	struct xfs_btree_cur	*rcur,

	int			error)

{

	struct xfs_buf		*agbp;



	if (rcur == NULL)

		return;

	agbp = rcur->bc_ag.agbp;

	xfs_btree_del_cursor(rcur, error);

	if (error)

		xfs_trans_brelse(tp, agbp);

}



/* Abort all pending CUIs. */

STATIC void

xfs_refcount_update_abort_intent(