public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: linux-xfs@vger.kernel.org
Subject: [PATCH 3/6] xfs: remove __xfs_icache_free_eofblocks
Date: Mon, 18 May 2020 19:04:34 +0200	[thread overview]
Message-ID: <20200518170437.1218883-4-hch@lst.de> (raw)
In-Reply-To: <20200518170437.1218883-1-hch@lst.de>

Just open code the trivial logic in the two callers.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 fs/xfs/xfs_icache.c | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
index 6c6f8015ab6ef..b638d12fb56a2 100644
--- a/fs/xfs/xfs_icache.c
+++ b/fs/xfs/xfs_icache.c
@@ -1504,30 +1504,17 @@ xfs_inode_free_eofblocks(
 	return ret;
 }
 
-static int
-__xfs_icache_free_eofblocks(
+int
+xfs_icache_free_eofblocks(
 	struct xfs_mount	*mp,
-	struct xfs_eofblocks	*eofb,
-	int			(*execute)(struct xfs_inode *ip, int flags,
-					   void *args),
-	int			tag)
+	struct xfs_eofblocks	*eofb)
 {
 	int flags = SYNC_TRYLOCK;
 
 	if (eofb && (eofb->eof_flags & XFS_EOF_FLAGS_SYNC))
 		flags = SYNC_WAIT;
-
-	return xfs_inode_ag_iterator_tag(mp, execute, flags,
-					 eofb, tag);
-}
-
-int
-xfs_icache_free_eofblocks(
-	struct xfs_mount	*mp,
-	struct xfs_eofblocks	*eofb)
-{
-	return __xfs_icache_free_eofblocks(mp, eofb, xfs_inode_free_eofblocks,
-			XFS_ICI_EOFBLOCKS_TAG);
+	return xfs_inode_ag_iterator_tag(mp, xfs_inode_free_eofblocks, flags,
+					 eofb, XFS_ICI_EOFBLOCKS_TAG);
 }
 
 /*
@@ -1789,8 +1776,12 @@ xfs_icache_free_cowblocks(
 	struct xfs_mount	*mp,
 	struct xfs_eofblocks	*eofb)
 {
-	return __xfs_icache_free_eofblocks(mp, eofb, xfs_inode_free_cowblocks,
-			XFS_ICI_COWBLOCKS_TAG);
+	int flags = SYNC_TRYLOCK;
+
+	if (eofb && (eofb->eof_flags & XFS_EOF_FLAGS_SYNC))
+		flags = SYNC_WAIT;
+	return xfs_inode_ag_iterator_tag(mp, xfs_inode_free_cowblocks, flags,
+					 eofb, XFS_ICI_COWBLOCKS_TAG);
 }
 
 int
-- 
2.26.2


  parent reply	other threads:[~2020-05-18 17:04 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-18 17:04 inode iterator cleanups Christoph Hellwig
2020-05-18 17:04 ` [PATCH 1/6] xfs: remove xfs_inode_ag_iterator Christoph Hellwig
2020-05-18 17:04 ` [PATCH 2/6] xfs: mark xfs_inode_ag_iterator_tag static Christoph Hellwig
2020-05-18 17:04 ` Christoph Hellwig [this message]
2020-05-18 17:04 ` [PATCH 4/6] xfs: merge xfs_inode_free_quota_{eof,cow}blocks Christoph Hellwig
2020-05-18 17:04 ` [PATCH 5/6] xfs: add a flags argument to xfs_icache_free_cowblocks Christoph Hellwig
2020-05-18 17:04 ` [PATCH 6/6] xfs: add a flags argument to xfs_icache_free_eofblocks Christoph Hellwig
2020-05-19  1:23 ` inode iterator cleanups Darrick J. Wong
2020-05-19  6:40   ` Christoph Hellwig
2020-05-20  1:45     ` Darrick J. Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200518170437.1218883-4-hch@lst.de \
    --to=hch@lst.de \
    --cc=linux-xfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox