From: Christoph Hellwig <hch@infradead.org>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 1/8] xfs: clean up iunlink functions
Date: Fri, 1 Feb 2019 00:01:36 -0800 [thread overview]
Message-ID: <20190201080136.GC22295@infradead.org> (raw)
In-Reply-To: <154897667679.26065.17995098675615600714.stgit@magnolia>
On Thu, Jan 31, 2019 at 03:17:56PM -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>
> ---
> fs/xfs/xfs_inode.c | 77 +++++++++++++++++++++++++++-------------------------
> 1 file changed, 40 insertions(+), 37 deletions(-)
>
>
> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> index c8bf02be0003..d18354517320 100644
> --- a/fs/xfs/xfs_inode.c
> +++ b/fs/xfs/xfs_inode.c
> @@ -1892,26 +1892,32 @@ 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_agino_t agino;
> + short bucket_index;
> + int offset;
> + int error;
>
> ASSERT(VFS_I(ip)->i_mode != 0);
> + ASSERT(xfs_verify_ino(mp, ip->i_ino));
This verify_ino calls seems odd given that we pass in an initialized
inode struct..
> +
> + agno = XFS_INO_TO_AGNO(mp, ip->i_ino);
> + agino = XFS_INO_TO_AGINO(mp, ip->i_ino);
And then we could move these initializations up int othe lines with
the variable declarations.
> + bucket_index = agino % XFS_AGI_UNLINKED_BUCKETS;
>
> /*
> * Get the agi buffer first. It ensures lock ordering
> * on the list.
> */
If you are touching this anyway, the whole comment could be changed
into a single line..
> + if (!xfs_verify_ino(mp, ip->i_ino))
> + return -EFSCORRUPTED;
>
> - mp = tp->t_mountp;
> agno = XFS_INO_TO_AGNO(mp, ip->i_ino);
> + agino = XFS_INO_TO_AGINO(mp, ip->i_ino);
Same here.
next prev parent reply other threads:[~2019-02-01 8:01 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-31 23:17 [PATCH 0/8] xfs: incore unlinked list Darrick J. Wong
2019-01-31 23:17 ` [PATCH 1/8] xfs: clean up iunlink functions Darrick J. Wong
2019-02-01 8:01 ` Christoph Hellwig [this message]
2019-02-02 19:15 ` Darrick J. Wong
2019-01-31 23:18 ` [PATCH 2/8] xfs: track unlinked inode counts in per-ag data Darrick J. Wong
2019-02-01 18:59 ` Brian Foster
2019-02-01 19:33 ` Darrick J. Wong
2019-02-02 16:14 ` Christoph Hellwig
2019-02-02 19:28 ` Darrick J. Wong
2019-01-31 23:18 ` [PATCH 3/8] xfs: refactor AGI unlinked bucket updates Darrick J. Wong
2019-02-01 19:00 ` Brian Foster
2019-02-02 19:50 ` Darrick J. Wong
2019-02-02 16:21 ` Christoph Hellwig
2019-02-02 19:51 ` Darrick J. Wong
2019-01-31 23:18 ` [PATCH 4/8] xfs: strengthen AGI unlinked inode bucket pointer checks Darrick J. Wong
2019-02-01 19:00 ` Brian Foster
2019-02-02 16:22 ` Christoph Hellwig
2019-01-31 23:18 ` [PATCH 5/8] xfs: refactor inode unlinked pointer update functions Darrick J. Wong
2019-02-01 19:01 ` Brian Foster
2019-02-02 22:00 ` Darrick J. Wong
2019-02-02 16:27 ` Christoph Hellwig
2019-02-02 20:29 ` Darrick J. Wong
2019-01-31 23:18 ` [PATCH 6/8] xfs: hoist unlinked list search and mapping to a separate function Darrick J. Wong
2019-02-01 19:01 ` Brian Foster
2019-02-02 20:46 ` Darrick J. Wong
2019-02-04 13:18 ` Brian Foster
2019-02-04 16:31 ` Darrick J. Wong
2019-02-02 16:30 ` Christoph Hellwig
2019-02-02 20:42 ` Darrick J. Wong
2019-02-02 16:51 ` Christoph Hellwig
2019-01-31 23:18 ` [PATCH 7/8] xfs: add tracepoints for high level iunlink operations Darrick J. Wong
2019-02-01 19:01 ` Brian Foster
2019-02-01 19:14 ` Darrick J. Wong
2019-01-31 23:18 ` [PATCH 8/8] xfs: cache unlinked pointers in an rhashtable Darrick J. Wong
2019-02-01 8:03 ` Christoph Hellwig
2019-02-01 23:59 ` Dave Chinner
2019-02-02 4:31 ` Darrick J. Wong
2019-02-02 16:07 ` Christoph Hellwig
2019-02-01 19:29 ` Brian Foster
2019-02-01 19:40 ` Darrick J. Wong
2019-02-02 17:01 ` Christoph Hellwig
2019-02-01 7:57 ` [PATCH 0/8] xfs: incore unlinked list Christoph Hellwig
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=20190201080136.GC22295@infradead.org \
--to=hch@infradead.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.