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

Commit 7279aa13 authored Aug 01, 2018 by Brian Foster Committed by Darrick J. Wong Aug 02, 2018

xfs: remove unused __xfs_defer_cancel() internal helper



With no more external dfops users, there is no need for an
xfs_defer_ops cancel wrapper.

Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

parent fbfa977d

fs/xfs/libxfs/xfs_defer.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -465,9 +465,10 @@ xfs_defer_finish(
	* Free up any items left in the list.		* Free up any items left in the list.
	*/		*/
	void		void
	__xfs_defer_cancel(		xfs_defer_cancel(
	struct xfs_defer_ops *dop)		struct xfs_trans *tp)
	{		{
			struct xfs_defer_ops *dop = tp->t_dfops;
	struct xfs_defer_pending *dfp;		struct xfs_defer_pending *dfp;
	struct xfs_defer_pending *pli;		struct xfs_defer_pending *pli;
	struct list_head *pwi;		struct list_head *pwi;

fs/xfs/libxfs/xfs_defer.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -50,7 +50,7 @@ void xfs_defer_add(struct xfs_defer_ops *dop, enum xfs_defer_ops_type type,
	struct list_head *h);		struct list_head *h);
	int xfs_defer_finish_noroll(struct xfs_trans **tp);		int xfs_defer_finish_noroll(struct xfs_trans **tp);
	int xfs_defer_finish(struct xfs_trans **tp);		int xfs_defer_finish(struct xfs_trans **tp);
	void __xfs_defer_cancel(struct xfs_defer_ops *dop);		void xfs_defer_cancel(struct xfs_trans *);
	void xfs_defer_init(struct xfs_trans tp, struct xfs_defer_ops dop);		void xfs_defer_init(struct xfs_trans tp, struct xfs_defer_ops dop);
	bool xfs_defer_has_unfinished_work(struct xfs_defer_ops *dop);		bool xfs_defer_has_unfinished_work(struct xfs_defer_ops *dop);
	int xfs_defer_ijoin(struct xfs_defer_ops dop, struct xfs_inode ip);		int xfs_defer_ijoin(struct xfs_defer_ops dop, struct xfs_inode ip);

fs/xfs/xfs_trans.c

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -1110,10 +1110,3 @@ xfs_trans_roll(
	tres.tr_logflags = XFS_TRANS_PERM_LOG_RES;		tres.tr_logflags = XFS_TRANS_PERM_LOG_RES;
	return xfs_trans_reserve(*tpp, &tres, 0, 0);		return xfs_trans_reserve(*tpp, &tres, 0, 0);
	}		}

	void
	xfs_defer_cancel(
	struct xfs_trans *tp)
	{
	__xfs_defer_cancel(tp->t_dfops);
	}

fs/xfs/xfs_trans.h

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -214,9 +214,6 @@ xfs_trans_read_buf(
	flags, bpp, ops);		flags, bpp, ops);
	}		}

	/* cancel dfops associated with a transaction */
	void xfs_defer_cancel(struct xfs_trans *);

	struct xfs_buf xfs_trans_getsb(xfs_trans_t , struct xfs_mount *, int);		struct xfs_buf xfs_trans_getsb(xfs_trans_t , struct xfs_mount *, int);

	void xfs_trans_brelse(xfs_trans_t , struct xfs_buf );		void xfs_trans_brelse(xfs_trans_t , struct xfs_buf );