On Mon, Jun 27, 2022 at 10:43:28AM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@xxxxxxxxxx>
>
> 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@xxxxxxxxxx>
With the whitespace damage fixed,
Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>
--D
> ---
> fs/xfs/xfs_inode.c | 113 +++++++++++++++++++++++++++------------------
> 1 file changed, 68 insertions(+), 45 deletions(-)
>
> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> index 52d6f2c7d58b..2a371c3431c9 100644
> --- a/fs/xfs/xfs_inode.c
> +++ b/fs/xfs/xfs_inode.c
> @@ -2129,39 +2129,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_perag *pag,
> + struct xfs_buf *agibp,
> struct xfs_inode *ip)
> -{
> + {
> struct xfs_mount *mp = tp->t_mountp;
> - struct xfs_perag *pag;
> - struct xfs_agi *agi;
> - struct xfs_buf *agibp;
> + struct xfs_agi *agi = agibp->b_addr;
> xfs_agino_t next_agino;
> xfs_agino_t agino = XFS_INO_TO_AGINO(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);
> -
> - pag = xfs_perag_get(mp, XFS_INO_TO_AGNO(mp, ip->i_ino));
> -
> - /* Get the agi buffer first. It ensures lock ordering on the list. */
> - error = xfs_read_agi(mp, tp, pag->pag_agno, &agibp);
> - if (error)
> - goto out;
> - agi = agibp->b_addr;
> -
> /*
> * Get the index into the agi hash table for the list this inode will
> * go on. Make sure the pointer isn't garbage and that this inode
> @@ -2171,8 +2152,7 @@ xfs_iunlink(
> if (next_agino == agino ||
> !xfs_verify_agino_or_null(mp, pag->pag_agno, next_agino)) {
> xfs_buf_mark_corrupt(agibp);
> - error = -EFSCORRUPTED;
> - goto out;
> + return -EFSCORRUPTED;
> }
>
> if (next_agino != NULLAGINO) {
> @@ -2185,7 +2165,7 @@ xfs_iunlink(
> error = xfs_iunlink_update_inode(tp, ip, pag, next_agino,
> &old_agino);
> if (error)
> - goto out;
> + return error;
> ASSERT(old_agino == NULLAGINO);
>
> /*
> @@ -2194,11 +2174,42 @@ xfs_iunlink(
> */
> error = xfs_iunlink_add_backref(pag, agino, next_agino);
> if (error)
> - goto out;
> + return error;
> }
>
> /* Point the head of the list to point to this inode. */
> - error = xfs_iunlink_update_bucket(tp, pag, agibp, bucket_index, agino);
> + return xfs_iunlink_update_bucket(tp, pag, 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_perag *pag;
> + struct xfs_buf *agibp;
> + int error;
> +
> + ASSERT(VFS_I(ip)->i_nlink == 0);
> + ASSERT(VFS_I(ip)->i_mode != 0);
> + trace_xfs_iunlink(ip);
> +
> + pag = xfs_perag_get(mp, XFS_INO_TO_AGNO(mp, ip->i_ino));
> +
> + /* Get the agi buffer first. It ensures lock ordering on the list. */
> + error = xfs_read_agi(mp, tp, pag->pag_agno, &agibp);
> + if (error)
> + goto out;
> +
> + error = xfs_iunlink_insert_inode(tp, pag, agibp, ip);
> out:
> xfs_perag_put(pag);
> return error;
> @@ -2319,18 +2330,15 @@ 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_perag *pag,
> + 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_agi *agi = agibp->b_addr;
> struct xfs_buf *last_ibp;
> struct xfs_dinode *last_dip = NULL;
> xfs_agino_t agino = XFS_INO_TO_AGINO(mp, ip->i_ino);
> @@ -2339,14 +2347,6 @@ xfs_iunlink_remove(
> 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, pag->pag_agno, &agibp);
> - if (error)
> - return error;
> - agi = agibp->b_addr;
> -
> /*
> * Get the index into the agi hash table for the list this inode will
> * go on. Make sure the head pointer isn't garbage.
> @@ -2411,6 +2411,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_perag *pag,
> + struct xfs_inode *ip)
> +{
> + struct xfs_mount *mp = tp->t_mountp;
> + struct xfs_buf *agibp;
> + 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, pag->pag_agno, &agibp);
> + if (error)
> + return error;
> +
> + return xfs_iunlink_remove_inode(tp, pag, 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.36.1
>
