From: Brian Foster <bfoster@redhat.com>
Date: Fri, 5 Oct 2018 02:36:11 +0000 (-0500)
Subject: xfs: remove unused __xfs_defer_cancel() internal helper
X-Git-Tag: v4.19.0-rc0~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=229135509c199a61a88335ec6ab4441b640b5c85;p=thirdparty%2Fxfsprogs-dev.git

xfs: remove unused __xfs_defer_cancel() internal helper

Source kernel commit: 7279aa13b8fb954f50073a672f912898198efd14

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>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/libxfs/trans.c b/libxfs/trans.c
index 3221a3f52..0438ebcd0 100644
--- a/libxfs/trans.c
+++ b/libxfs/trans.c
@@ -115,14 +115,6 @@ libxfs_trans_roll(
 	return xfs_trans_reserve(*tpp, &tres, 0, 0);
 }
 
-void
-xfs_defer_cancel(
-	struct xfs_trans	*tp)
-{
-	__xfs_defer_cancel(tp->t_dfops);
-}
-
-
 /*
  * Free the transaction structure.  If there is more clean up
  * to do when the structure is freed, add it here.
diff --git a/libxfs/xfs_defer.c b/libxfs/xfs_defer.c
index 1cd865dce..09323c0d6 100644
--- a/libxfs/xfs_defer.c
+++ b/libxfs/xfs_defer.c
@@ -465,9 +465,10 @@ xfs_defer_finish(
  * Free up any items left in the list.
  */
 void
-__xfs_defer_cancel(
-	struct xfs_defer_ops		*dop)
+xfs_defer_cancel(
+	struct xfs_trans		*tp)
 {
+	struct xfs_defer_ops		*dop = tp->t_dfops;
 	struct xfs_defer_pending	*dfp;
 	struct xfs_defer_pending	*pli;
 	struct list_head		*pwi;
diff --git a/libxfs/xfs_defer.h b/libxfs/xfs_defer.h
index 85c41fe4d..da145fc04 100644
--- a/libxfs/xfs_defer.h
+++ b/libxfs/xfs_defer.h
@@ -50,7 +50,7 @@ void xfs_defer_add(struct xfs_defer_ops *dop, enum xfs_defer_ops_type type,
 		struct list_head *h);
 int xfs_defer_finish_noroll(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);
 bool xfs_defer_has_unfinished_work(struct xfs_defer_ops *dop);
 int xfs_defer_ijoin(struct xfs_defer_ops *dop, struct xfs_inode *ip);