From: Brian Foster <bfoster@redhat.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org, hch@lst.de
Subject: Re: [PATCH 07/12] xfs: refactor eofb matching into a single helper
Date: Fri, 22 May 2020 08:23:23 -0400 [thread overview]
Message-ID: <20200522122323.GH50656@bfoster> (raw)
In-Reply-To: <159011605255.77079.12439333473840564314.stgit@magnolia>
On Thu, May 21, 2020 at 07:54:12PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> Refactor the two eofb-matching logics into a single helper so that we
> don't repeat ourselves.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/xfs_icache.c | 62 ++++++++++++++++++++++++++++-----------------------
> 1 file changed, 34 insertions(+), 28 deletions(-)
>
>
> diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
> index 11a5e6897639..3a45ec948c1a 100644
> --- a/fs/xfs/xfs_icache.c
> +++ b/fs/xfs/xfs_icache.c
> @@ -1436,6 +1436,36 @@ xfs_inode_match_id_union(
> return 0;
> }
>
> +/*
> + * Is this inode @ip eligible for eof/cow block reclamation, given some
> + * filtering parameters @eofb? The inode is eligible if @eofb is null or
> + * if the predicate functions match.
> + */
> +static bool
> +xfs_inode_matches_eofb(
> + struct xfs_inode *ip,
> + struct xfs_eofblocks *eofb)
> +{
> + int match;
> +
> + if (!eofb)
> + return true;
> +
> + if (eofb->eof_flags & XFS_EOF_FLAGS_UNION)
> + match = xfs_inode_match_id_union(ip, eofb);
> + else
> + match = xfs_inode_match_id(ip, eofb);
> + if (!match)
> + return false;
> +
> + /* skip the inode if the file size is too small */
> + if ((eofb->eof_flags & XFS_EOF_FLAGS_MINFILESIZE) &&
> + XFS_ISIZE(ip) < eofb->eof_min_file_size)
> + return false;
> +
> + return true;
> +}
> +
> STATIC int
> xfs_inode_free_eofblocks(
> struct xfs_inode *ip,
> @@ -1443,7 +1473,6 @@ xfs_inode_free_eofblocks(
> {
> struct xfs_eofblocks *eofb = args;
> bool wait;
> - int match;
> int ret;
>
> wait = eofb && (eofb->eof_flags & XFS_EOF_FLAGS_SYNC);
> @@ -1462,19 +1491,8 @@ xfs_inode_free_eofblocks(
> if (!wait && mapping_tagged(VFS_I(ip)->i_mapping, PAGECACHE_TAG_DIRTY))
> return 0;
>
> - if (eofb) {
> - if (eofb->eof_flags & XFS_EOF_FLAGS_UNION)
> - match = xfs_inode_match_id_union(ip, eofb);
> - else
> - match = xfs_inode_match_id(ip, eofb);
> - if (!match)
> - return 0;
> -
> - /* skip the inode if the file size is too small */
> - if (eofb->eof_flags & XFS_EOF_FLAGS_MINFILESIZE &&
> - XFS_ISIZE(ip) < eofb->eof_min_file_size)
> - return 0;
> - }
> + if (!xfs_inode_matches_eofb(ip, eofb))
> + return 0;
>
> /*
> * If the caller is waiting, return -EAGAIN to keep the background
> @@ -1717,25 +1735,13 @@ xfs_inode_free_cowblocks(
> void *args)
> {
> struct xfs_eofblocks *eofb = args;
> - int match;
> int ret = 0;
>
> if (!xfs_prep_free_cowblocks(ip))
> return 0;
>
> - if (eofb) {
> - if (eofb->eof_flags & XFS_EOF_FLAGS_UNION)
> - match = xfs_inode_match_id_union(ip, eofb);
> - else
> - match = xfs_inode_match_id(ip, eofb);
> - if (!match)
> - return 0;
> -
> - /* skip the inode if the file size is too small */
> - if (eofb->eof_flags & XFS_EOF_FLAGS_MINFILESIZE &&
> - XFS_ISIZE(ip) < eofb->eof_min_file_size)
> - return 0;
> - }
> + if (!xfs_inode_matches_eofb(ip, eofb))
> + return 0;
>
> /* Free the CoW blocks */
> xfs_ilock(ip, XFS_IOLOCK_EXCL);
>
next prev parent reply other threads:[~2020-05-22 12:23 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-22 2:53 [PATCH v4 00/12] xfs: refactor incore inode walking Darrick J. Wong
2020-05-22 2:53 ` [PATCH 01/12] xfs: move eofblocks conversion function to xfs_ioctl.c Darrick J. Wong
2020-05-22 12:03 ` Brian Foster
2020-05-22 2:53 ` [PATCH 02/12] xfs: replace open-coded XFS_ICI_NO_TAG Darrick J. Wong
2020-05-22 12:03 ` Brian Foster
2020-05-22 2:53 ` [PATCH 03/12] xfs: remove unused xfs_inode_ag_iterator function Darrick J. Wong
2020-05-22 12:03 ` Brian Foster
2020-05-22 2:53 ` [PATCH 04/12] xfs: remove xfs_inode_ag_iterator_flags Darrick J. Wong
2020-05-22 12:03 ` Brian Foster
2020-05-22 2:53 ` [PATCH 05/12] xfs: remove flags argument from xfs_inode_ag_walk Darrick J. Wong
2020-05-22 6:37 ` Christoph Hellwig
2020-05-22 12:03 ` Brian Foster
2020-05-22 2:54 ` [PATCH 06/12] xfs: remove __xfs_icache_free_eofblocks Darrick J. Wong
2020-05-22 12:03 ` Brian Foster
2020-05-22 2:54 ` [PATCH 07/12] xfs: refactor eofb matching into a single helper Darrick J. Wong
2020-05-22 6:38 ` Christoph Hellwig
2020-05-22 12:23 ` Brian Foster [this message]
2020-05-22 2:54 ` [PATCH 08/12] xfs: fix inode ag walk predicate function return values Darrick J. Wong
2020-05-22 12:23 ` Brian Foster
2020-05-22 2:54 ` [PATCH 09/12] xfs: use bool for done in xfs_inode_ag_walk Darrick J. Wong
2020-05-22 12:23 ` Brian Foster
2020-05-22 2:54 ` [PATCH 10/12] xfs: move xfs_inode_ag_iterator to be closer to the perag walking code Darrick J. Wong
2020-05-22 12:23 ` Brian Foster
2020-05-22 2:54 ` [PATCH 11/12] xfs: straighten out all the naming around incore inode tree walks Darrick J. Wong
2020-05-22 6:38 ` Christoph Hellwig
2020-05-22 12:23 ` Brian Foster
2020-05-22 2:54 ` [PATCH 12/12] xfs: rearrange xfs_inode_walk_ag parameters Darrick J. Wong
2020-05-22 6:39 ` Christoph Hellwig
2020-05-22 12:23 ` Brian Foster
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=20200522122323.GH50656@bfoster \
--to=bfoster@redhat.com \
--cc=darrick.wong@oracle.com \
--cc=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;
as well as URLs for NNTP newsgroup(s).