From: Brian Foster <bfoster@redhat.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 01/10] xfs: clean up iunlink functions
Date: Mon, 4 Feb 2019 14:24:44 -0500 [thread overview]
Message-ID: <20190204192443.GA47560@bfoster> (raw)
In-Reply-To: <154930314303.31814.5572163514956583050.stgit@magnolia>
On Mon, Feb 04, 2019 at 09:59:03AM -0800, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> Fix some indentation issues with the iunlink functions and reorganize
> the tops of the functions to be identical. No functional changes.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/xfs_inode.c | 79 +++++++++++++++++++++-------------------------------
> 1 file changed, 32 insertions(+), 47 deletions(-)
>
>
> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> index c8bf02be0003..2367cdfcd90b 100644
> --- a/fs/xfs/xfs_inode.c
> +++ b/fs/xfs/xfs_inode.c
> @@ -1892,26 +1892,24 @@ xfs_inactive(
> */
> STATIC int
> xfs_iunlink(
> - struct xfs_trans *tp,
> - struct xfs_inode *ip)
> + struct xfs_trans *tp,
> + struct xfs_inode *ip)
> {
> - xfs_mount_t *mp = tp->t_mountp;
> - xfs_agi_t *agi;
> - xfs_dinode_t *dip;
> - xfs_buf_t *agibp;
> - xfs_buf_t *ibp;
> - xfs_agino_t agino;
> - short bucket_index;
> - int offset;
> - int error;
> + struct xfs_mount *mp = tp->t_mountp;
> + struct xfs_agi *agi;
> + struct xfs_dinode *dip;
> + struct xfs_buf *agibp;
> + struct xfs_buf *ibp;
> + xfs_agnumber_t agno = XFS_INO_TO_AGNO(mp, ip->i_ino);
> + xfs_agino_t agino = XFS_INO_TO_AGINO(mp, ip->i_ino);
> + short bucket_index = agino % XFS_AGI_UNLINKED_BUCKETS;
> + int offset;
> + int error;
>
> ASSERT(VFS_I(ip)->i_mode != 0);
>
> - /*
> - * Get the agi buffer first. It ensures lock ordering
> - * on the list.
> - */
> - error = xfs_read_agi(mp, tp, XFS_INO_TO_AGNO(mp, ip->i_ino), &agibp);
> + /* 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 = XFS_BUF_TO_AGI(agibp);
> @@ -1920,9 +1918,6 @@ xfs_iunlink(
> * Get the index into the agi hash table for the
> * list this inode will go on.
> */
> - agino = XFS_INO_TO_AGINO(mp, ip->i_ino);
> - ASSERT(agino != 0);
> - bucket_index = agino % XFS_AGI_UNLINKED_BUCKETS;
> ASSERT(agi->agi_unlinked[bucket_index]);
> ASSERT(be32_to_cpu(agi->agi_unlinked[bucket_index]) != agino);
>
> @@ -1969,45 +1964,35 @@ xfs_iunlink(
> */
> STATIC int
> xfs_iunlink_remove(
> - xfs_trans_t *tp,
> - xfs_inode_t *ip)
> + struct xfs_trans *tp,
> + struct xfs_inode *ip)
> {
> - xfs_ino_t next_ino;
> - xfs_mount_t *mp;
> - xfs_agi_t *agi;
> - xfs_dinode_t *dip;
> - xfs_buf_t *agibp;
> - xfs_buf_t *ibp;
> - xfs_agnumber_t agno;
> - xfs_agino_t agino;
> - xfs_agino_t next_agino;
> - xfs_buf_t *last_ibp;
> - xfs_dinode_t *last_dip = NULL;
> - short bucket_index;
> - int offset, last_offset = 0;
> - int error;
> -
> - mp = tp->t_mountp;
> - agno = XFS_INO_TO_AGNO(mp, ip->i_ino);
> + struct xfs_mount *mp = tp->t_mountp;
> + struct xfs_agi *agi;
> + struct xfs_dinode *dip;
> + struct xfs_buf *agibp;
> + struct xfs_buf *ibp;
> + struct xfs_buf *last_ibp;
> + struct xfs_dinode *last_dip = NULL;
> + xfs_ino_t next_ino;
> + 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_agino_t next_agino;
> + short bucket_index = agino % XFS_AGI_UNLINKED_BUCKETS;
> + int offset;
> + int last_offset = 0;
> + int error;
>
> - /*
> - * Get the agi buffer first. It ensures lock ordering
> - * on the list.
> - */
> + /* 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 = XFS_BUF_TO_AGI(agibp);
>
> /*
> * Get the index into the agi hash table for the
> * list this inode will go on.
> */
> - agino = XFS_INO_TO_AGINO(mp, ip->i_ino);
> - if (!xfs_verify_agino(mp, agno, agino))
> - return -EFSCORRUPTED;
> - bucket_index = agino % XFS_AGI_UNLINKED_BUCKETS;
> if (!xfs_verify_agino(mp, agno,
> be32_to_cpu(agi->agi_unlinked[bucket_index]))) {
> XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
>
next prev parent reply other threads:[~2019-02-04 19:24 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-04 17:58 [PATCH v2 00/10] xfs: incore unlinked list Darrick J. Wong
2019-02-04 17:59 ` [PATCH 01/10] xfs: clean up iunlink functions Darrick J. Wong
2019-02-04 19:24 ` Brian Foster [this message]
2019-02-04 20:51 ` Christoph Hellwig
2019-02-04 17:59 ` [PATCH 02/10] xfs: track unlinked inode counts in per-ag data Darrick J. Wong
2019-02-04 19:24 ` Brian Foster
2019-02-04 20:53 ` Christoph Hellwig
2019-02-05 0:26 ` Darrick J. Wong
2019-02-05 6:55 ` Christoph Hellwig
2019-02-05 7:07 ` Darrick J. Wong
2019-02-05 0:42 ` Darrick J. Wong
2019-02-04 17:59 ` [PATCH 03/10] xfs: add xfs_verify_agino_or_null helper Darrick J. Wong
2019-02-04 19:24 ` Brian Foster
2019-02-04 20:53 ` Christoph Hellwig
2019-02-04 17:59 ` [PATCH 04/10] xfs: refactor AGI unlinked bucket updates Darrick J. Wong
2019-02-04 19:25 ` Brian Foster
2019-02-04 20:54 ` Christoph Hellwig
2019-02-04 17:59 ` [PATCH 05/10] xfs: strengthen AGI unlinked inode bucket pointer checks Darrick J. Wong
2019-02-04 17:59 ` [PATCH 06/10] xfs: refactor inode unlinked pointer update functions Darrick J. Wong
2019-02-04 20:56 ` Christoph Hellwig
2019-02-04 21:49 ` Darrick J. Wong
2019-02-05 14:23 ` Brian Foster
2019-02-04 17:59 ` [PATCH 07/10] xfs: refactor unlinked list search and mapping to a separate function Darrick J. Wong
2019-02-04 20:58 ` Christoph Hellwig
2019-02-04 22:23 ` Darrick J. Wong
2019-02-04 17:59 ` [PATCH 08/10] xfs: refactor inode update in iunlink_remove Darrick J. Wong
2019-02-04 20:58 ` Christoph Hellwig
2019-02-05 14:23 ` Brian Foster
2019-02-04 17:59 ` [PATCH 09/10] xfs: add tracepoints for high level iunlink operations Darrick J. Wong
2019-02-04 20:59 ` Christoph Hellwig
2019-02-05 14:24 ` Brian Foster
2019-02-04 18:00 ` [PATCH 10/10] xfs: cache unlinked pointers in an rhashtable Darrick J. Wong
2019-02-04 21:08 ` Christoph Hellwig
2019-02-05 1:02 ` Darrick J. Wong
2019-02-05 14:24 ` Brian Foster
2019-02-05 17:53 ` Darrick J. Wong
2019-02-05 17:57 ` Christoph Hellwig
2019-02-05 18:17 ` Darrick J. Wong
2019-02-05 19:06 ` Brian Foster
2019-02-05 19:20 ` Darrick J. Wong
2019-02-05 20:59 ` Dave Chinner
2019-02-06 18:25 ` 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=20190204192443.GA47560@bfoster \
--to=bfoster@redhat.com \
--cc=darrick.wong@oracle.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).