From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Dave Chinner <david@fromorbit.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 03/13] xfs: factor the xfs_iunlink functions
Date: Tue, 18 Aug 2020 16:49:10 -0700 [thread overview]
Message-ID: <20200818234910.GQ6096@magnolia> (raw)
In-Reply-To: <20200812092556.2567285-4-david@fromorbit.com>
On Wed, Aug 12, 2020 at 07:25:46PM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> Prep work that separates the locking that protects the unlinked list
> from the actual operations being performed. This also helps document
> the fact they are performing list insert and remove operations. No
> functional code change.
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
Seems pretty straightforward.
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> ---
> fs/xfs/xfs_inode.c | 92 ++++++++++++++++++++++++++++++----------------
> 1 file changed, 60 insertions(+), 32 deletions(-)
>
> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> index 2072bd25989a..f2f502b65691 100644
> --- a/fs/xfs/xfs_inode.c
> +++ b/fs/xfs/xfs_inode.c
> @@ -2205,35 +2205,20 @@ xfs_iunlink_update_inode(
> return error;
> }
>
> -/*
> - * This is called when the inode's link count has gone to 0 or we are creating
> - * a tmpfile via O_TMPFILE. The inode @ip must have nlink == 0.
> - *
> - * We place the on-disk inode on a list in the AGI. It will be pulled from this
> - * list when the inode is freed.
> - */
> -STATIC int
> -xfs_iunlink(
> +static int
> +xfs_iunlink_insert_inode(
> struct xfs_trans *tp,
> + struct xfs_buf *agibp,
> struct xfs_inode *ip)
> {
> struct xfs_mount *mp = tp->t_mountp;
> struct xfs_agi *agi;
> - struct xfs_buf *agibp;
> xfs_agino_t next_agino;
> - xfs_agnumber_t agno = XFS_INO_TO_AGNO(mp, ip->i_ino);
> xfs_agino_t agino = XFS_INO_TO_AGINO(mp, ip->i_ino);
> + xfs_agnumber_t agno = XFS_INO_TO_AGNO(mp, ip->i_ino);
> short bucket_index = agino % XFS_AGI_UNLINKED_BUCKETS;
> int error;
>
> - ASSERT(VFS_I(ip)->i_nlink == 0);
> - ASSERT(VFS_I(ip)->i_mode != 0);
> - trace_xfs_iunlink(ip);
> -
> - /* Get the agi buffer first. It ensures lock ordering on the list. */
> - error = xfs_read_agi(mp, tp, agno, &agibp);
> - if (error)
> - return error;
> agi = agibp->b_addr;
>
> /*
> @@ -2274,6 +2259,35 @@ xfs_iunlink(
> return xfs_iunlink_update_bucket(tp, agno, agibp, bucket_index, agino);
> }
>
> +/*
> + * This is called when the inode's link count has gone to 0 or we are creating
> + * a tmpfile via O_TMPFILE. The inode @ip must have nlink == 0.
> + *
> + * We place the on-disk inode on a list in the AGI. It will be pulled from this
> + * list when the inode is freed.
> + */
> +STATIC int
> +xfs_iunlink(
> + struct xfs_trans *tp,
> + struct xfs_inode *ip)
> +{
> + struct xfs_mount *mp = tp->t_mountp;
> + struct xfs_buf *agibp;
> + xfs_agnumber_t agno = XFS_INO_TO_AGNO(mp, ip->i_ino);
> + int error;
> +
> + ASSERT(VFS_I(ip)->i_nlink == 0);
> + ASSERT(VFS_I(ip)->i_mode != 0);
> + trace_xfs_iunlink(ip);
> +
> + /* Get the agi buffer first. It ensures lock ordering on the list. */
> + error = xfs_read_agi(mp, tp, agno, &agibp);
> + if (error)
> + return error;
> +
> + return xfs_iunlink_insert_inode(tp, agibp, ip);
> +}
> +
> /* Return the imap, dinode pointer, and buffer for an inode. */
> STATIC int
> xfs_iunlink_map_ino(
> @@ -2388,32 +2402,23 @@ xfs_iunlink_map_prev(
> return 0;
> }
>
> -/*
> - * Pull the on-disk inode from the AGI unlinked list.
> - */
> -STATIC int
> -xfs_iunlink_remove(
> +static int
> +xfs_iunlink_remove_inode(
> struct xfs_trans *tp,
> + struct xfs_buf *agibp,
> struct xfs_inode *ip)
> {
> struct xfs_mount *mp = tp->t_mountp;
> struct xfs_agi *agi;
> - struct xfs_buf *agibp;
> struct xfs_buf *last_ibp;
> struct xfs_dinode *last_dip = NULL;
> - xfs_agnumber_t agno = XFS_INO_TO_AGNO(mp, ip->i_ino);
> xfs_agino_t agino = XFS_INO_TO_AGINO(mp, ip->i_ino);
> + xfs_agnumber_t agno = XFS_INO_TO_AGNO(mp, ip->i_ino);
> xfs_agino_t next_agino;
> xfs_agino_t head_agino;
> short bucket_index = agino % XFS_AGI_UNLINKED_BUCKETS;
> int error;
>
> - trace_xfs_iunlink_remove(ip);
> -
> - /* Get the agi buffer first. It ensures lock ordering on the list. */
> - error = xfs_read_agi(mp, tp, agno, &agibp);
> - if (error)
> - return error;
> agi = agibp->b_addr;
>
> /*
> @@ -2482,6 +2487,29 @@ xfs_iunlink_remove(
> next_agino);
> }
>
> +/*
> + * Pull the on-disk inode from the AGI unlinked list.
> + */
> +STATIC int
> +xfs_iunlink_remove(
> + struct xfs_trans *tp,
> + struct xfs_inode *ip)
> +{
> + struct xfs_mount *mp = tp->t_mountp;
> + struct xfs_buf *agibp;
> + xfs_agnumber_t agno = XFS_INO_TO_AGNO(mp, ip->i_ino);
> + int error;
> +
> + trace_xfs_iunlink_remove(ip);
> +
> + /* Get the agi buffer first. It ensures lock ordering on the list. */
> + error = xfs_read_agi(mp, tp, agno, &agibp);
> + if (error)
> + return error;
> +
> + return xfs_iunlink_remove_inode(tp, agibp, ip);
> +}
> +
> /*
> * Look up the inode number specified and if it is not already marked XFS_ISTALE
> * mark it stale. We should only find clean inodes in this lookup that aren't
> --
> 2.26.2.761.g0e0b3e54be
>
next prev parent reply other threads:[~2020-08-18 23:49 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-12 9:25 [PATCH 00/13] xfs: in memory inode unlink log items Dave Chinner
2020-08-12 9:25 ` [PATCH 01/13] xfs: xfs_iflock is no longer a completion Dave Chinner
2020-08-18 23:44 ` Darrick J. Wong
2020-08-22 7:41 ` Christoph Hellwig
2020-08-12 9:25 ` [PATCH 02/13] xfs: add log item precommit operation Dave Chinner
2020-08-22 9:06 ` Christoph Hellwig
2020-08-12 9:25 ` [PATCH 03/13] xfs: factor the xfs_iunlink functions Dave Chinner
2020-08-18 23:49 ` Darrick J. Wong [this message]
2020-08-22 7:45 ` Christoph Hellwig
2020-08-12 9:25 ` [PATCH 04/13] xfs: arrange all unlinked inodes into one list Dave Chinner
2020-08-18 23:59 ` Darrick J. Wong
2020-08-19 0:45 ` Dave Chinner
2020-08-19 0:58 ` Gao Xiang
2020-08-22 9:01 ` Christoph Hellwig
2020-08-23 17:24 ` Gao Xiang
2020-08-24 8:19 ` [RFC PATCH] xfs: use log_incompat feature instead of speculate matching Gao Xiang
2020-08-24 8:34 ` Gao Xiang
2020-08-24 15:08 ` Darrick J. Wong
2020-08-24 15:41 ` Gao Xiang
2020-08-25 10:06 ` [PATCH] " Gao Xiang
2020-08-25 14:54 ` Darrick J. Wong
2020-08-25 15:30 ` Gao Xiang
2020-08-27 7:19 ` Christoph Hellwig
2020-08-12 9:25 ` [PATCH 05/13] xfs: add unlink list pointers to xfs_inode Dave Chinner
2020-08-19 0:02 ` Darrick J. Wong
2020-08-19 0:47 ` Dave Chinner
2020-08-22 9:03 ` Christoph Hellwig
2020-08-25 5:17 ` Dave Chinner
2020-08-27 7:21 ` Christoph Hellwig
2020-08-12 9:25 ` [PATCH 06/13] xfs: replace iunlink backref lookups with list lookups Dave Chinner
2020-08-19 0:13 ` Darrick J. Wong
2020-08-19 0:52 ` Dave Chinner
2020-08-12 9:25 ` [PATCH 07/13] xfs: mapping unlinked inodes is now redundant Dave Chinner
2020-08-19 0:14 ` Darrick J. Wong
2020-08-12 9:25 ` [PATCH 08/13] xfs: updating i_next_unlinked doesn't need to return old value Dave Chinner
2020-08-19 0:19 ` Darrick J. Wong
2020-08-12 9:25 ` [PATCH 09/13] xfs: validate the unlinked list pointer on update Dave Chinner
2020-08-19 0:23 ` Darrick J. Wong
2020-08-12 9:25 ` [PATCH 10/13] xfs: re-order AGI updates in unlink list updates Dave Chinner
2020-08-19 0:29 ` Darrick J. Wong
2020-08-19 1:01 ` Dave Chinner
2020-08-12 9:25 ` [PATCH 11/13] xfs: combine iunlink inode update functions Dave Chinner
2020-08-19 0:30 ` Darrick J. Wong
2020-08-12 9:25 ` [PATCH 12/13] xfs: add in-memory iunlink log item Dave Chinner
2020-08-19 0:35 ` Darrick J. Wong
2020-08-12 9:25 ` [PATCH 13/13] xfs: reorder iunlink remove operation in xfs_ifree Dave Chinner
2020-08-12 11:12 ` Gao Xiang
2020-08-19 0:45 ` Darrick J. Wong
2020-08-18 18:17 ` [PATCH 00/13] xfs: in memory inode unlink log items Darrick J. Wong
2020-08-18 20:01 ` Gao Xiang
2020-08-18 21:42 ` Dave Chinner
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=20200818234910.GQ6096@magnolia \
--to=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--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).