Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7dbddbac authored by Brian Foster's avatar Brian Foster Committed by Darrick J. Wong
Browse files

xfs: drop dop param from xfs_defer_op_type ->finish_item() callback 



The dfops infrastructure ->finish_item() callback passes the
transaction and dfops as separate parameters. Since dfops is always
part of a transaction, the latter parameter is no longer necessary.
Remove it from the various callbacks.

Signed-off-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent a8198666

fs/xfs/libxfs/xfs_bmap.c

+0 −2
Original line number Diff line number Diff line
@@ -6045,7 +6045,6 @@ xfs_bmap_unmap_extent( 
int

xfs_bmap_finish_one(

	struct xfs_trans		*tp,

	struct xfs_defer_ops		*dfops,

	struct xfs_inode		*ip,

	enum xfs_bmap_intent_type	type,

	int				whichfork,
@@ -6072,7 +6071,6 @@ xfs_bmap_finish_one( 


	switch (type) {

	case XFS_BMAP_MAP:

		ASSERT(dfops == tp->t_dfops);

		error = xfs_bmapi_remap(tp, ip, startoff, *blockcount,

				startblock, 0);

		*blockcount = 0;

fs/xfs/libxfs/xfs_bmap.h

+3 −3
Original line number Diff line number Diff line
@@ -252,9 +252,9 @@ struct xfs_bmap_intent { 
	struct xfs_bmbt_irec			bi_bmap;

};



int	xfs_bmap_finish_one(struct xfs_trans *tp, struct xfs_defer_ops *dfops,

		struct xfs_inode *ip, enum xfs_bmap_intent_type type,

		int whichfork, xfs_fileoff_t startoff, xfs_fsblock_t startblock,

int	xfs_bmap_finish_one(struct xfs_trans *tp, struct xfs_inode *ip,

		enum xfs_bmap_intent_type type, int whichfork,

		xfs_fileoff_t startoff, xfs_fsblock_t startblock,

		xfs_filblks_t *blockcount, xfs_exntst_t state);

int	xfs_bmap_map_extent(struct xfs_mount *mp, struct xfs_defer_ops *dfops,

		struct xfs_inode *ip, struct xfs_bmbt_irec *imap);

fs/xfs/libxfs/xfs_defer.c

+1 −1
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ xfs_defer_finish_noroll( 
		list_for_each_safe(li, n, &dfp->dfp_work) {

			list_del(li);

			dfp->dfp_count--;

			error = dfp->dfp_type->finish_item(*tp, dop, li,

			error = dfp->dfp_type->finish_item(*tp, li,

					dfp->dfp_done, &state);

			if (error == -EAGAIN) {

				/*

fs/xfs/libxfs/xfs_defer.h

+2 −2
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ struct xfs_defer_op_type { 
	unsigned int		max_items;

	void (*abort_intent)(void *);

	void *(*create_done)(struct xfs_trans *, void *, unsigned int);

	int (*finish_item)(struct xfs_trans *, struct xfs_defer_ops *,

			struct list_head *, void *, void **);

	int (*finish_item)(struct xfs_trans *, struct list_head *, void *,

			void **);

	void (*finish_cleanup)(struct xfs_trans *, void *, int);

	void (*cancel_item)(struct list_head *);

	int (*diff_items)(void *, struct list_head *, struct list_head *);

fs/xfs/libxfs/xfs_refcount.c

+1 −1
Original line number Diff line number Diff line
@@ -1082,7 +1082,6 @@ xfs_refcount_finish_one_cleanup( 
int

xfs_refcount_finish_one(

	struct xfs_trans		*tp,

	struct xfs_defer_ops		*dfops,

	enum xfs_refcount_intent_type	type,

	xfs_fsblock_t			startblock,

	xfs_extlen_t			blockcount,
@@ -1091,6 +1090,7 @@ xfs_refcount_finish_one( 
	struct xfs_btree_cur		**pcur)

{

	struct xfs_mount		*mp = tp->t_mountp;

	struct xfs_defer_ops		*dfops = tp->t_dfops;

	struct xfs_btree_cur		*rcur;

	struct xfs_buf			*agbp = NULL;

	int				error = 0;