From: Brian Foster <bfoster@redhat.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 07/12] xfs: remove xfs_iread
Date: Fri, 1 May 2020 11:56:15 -0400 [thread overview]
Message-ID: <20200501155615.GN40250@bfoster> (raw)
In-Reply-To: <20200501081424.2598914-8-hch@lst.de>
On Fri, May 01, 2020 at 10:14:19AM +0200, Christoph Hellwig wrote:
> There is not much point in the xfs_iread function, as it has a single
> caller and not a whole lot of code. Move it into the only caller,
> and trim down the overdocumentation to just documenting the important
> "why" instead of a lot of redundant "what".
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> fs/xfs/libxfs/xfs_inode_buf.c | 73 -----------------------------------
> fs/xfs/libxfs/xfs_inode_buf.h | 2 -
> fs/xfs/xfs_icache.c | 33 +++++++++++++++-
> 3 files changed, 32 insertions(+), 76 deletions(-)
>
...
> diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
> index 8bf1d15be3f6a..dd757c6614956 100644
> --- a/fs/xfs/xfs_icache.c
> +++ b/fs/xfs/xfs_icache.c
...
> @@ -510,10 +511,40 @@ xfs_iget_cache_miss(
> if (!ip)
> return -ENOMEM;
>
> - error = xfs_iread(mp, tp, ip, flags);
> + error = xfs_imap(mp, tp, ip->i_ino, &ip->i_imap, flags);
> if (error)
> goto out_destroy;
>
> + /*
> + * For version 5 superblocks, if we are initialising a new inode and we
> + * are not utilising the XFS_MOUNT_IKEEP inode cluster mode, we can
> + * simple build the new inode core with a random generation number.
I'm assuming the original comment meant to say "simply" here instead of
"simple." Otherwise looks good to me:
Reviewed-by: Brian Foster <bfoster@redhat.com>
> + *
> + * For version 4 (and older) superblocks, log recovery is dependent on
> + * the di_flushiter field being initialised from the current on-disk
> + * value and hence we must also read the inode off disk even when
> + * initializing new inodes.
> + */
> + if (xfs_sb_version_has_v3inode(&mp->m_sb) &&
> + (flags & XFS_IGET_CREATE) && !(mp->m_flags & XFS_MOUNT_IKEEP)) {
> + VFS_I(ip)->i_generation = prandom_u32();
> + } else {
> + struct xfs_dinode *dip;
> + struct xfs_buf *bp;
> +
> + error = xfs_imap_to_bp(mp, tp, &ip->i_imap, &dip, &bp, 0, flags);
> + if (error)
> + goto out_destroy;
> +
> + error = xfs_inode_from_disk(ip, dip);
> + if (!error)
> + xfs_buf_set_ref(bp, XFS_INO_REF);
> + xfs_trans_brelse(tp, bp);
> +
> + if (error)
> + goto out_destroy;
> + }
> +
> if (!xfs_inode_verify_forks(ip)) {
> error = -EFSCORRUPTED;
> goto out_destroy;
> --
> 2.26.2
>
next prev parent reply other threads:[~2020-05-01 15:56 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-01 8:14 dinode reading cleanups Christoph Hellwig
2020-05-01 8:14 ` [PATCH 01/12] xfs: xfs_bmapi_read doesn't take a fork id as the last argument Christoph Hellwig
2020-05-01 13:33 ` Brian Foster
2020-05-01 8:14 ` [PATCH 02/12] xfs: call xfs_iformat_fork from xfs_inode_from_disk Christoph Hellwig
2020-05-01 13:33 ` Brian Foster
2020-05-01 8:14 ` [PATCH 03/12] xfs: split xfs_iformat_fork Christoph Hellwig
2020-05-01 13:34 ` Brian Foster
2020-05-07 12:27 ` Christoph Hellwig
2020-05-07 13:40 ` Brian Foster
2020-05-07 13:42 ` Christoph Hellwig
2020-05-01 8:14 ` [PATCH 04/12] xfs: handle unallocated inodes in xfs_inode_from_disk Christoph Hellwig
2020-05-01 13:34 ` Brian Foster
2020-05-01 8:14 ` [PATCH 05/12] xfs: call xfs_dinode_verify from xfs_inode_from_disk Christoph Hellwig
2020-05-01 13:34 ` Brian Foster
2020-05-01 8:14 ` [PATCH 06/12] xfs: don't reset i_delayed_blks in xfs_iread Christoph Hellwig
2020-05-01 13:34 ` Brian Foster
2020-05-01 8:14 ` [PATCH 07/12] xfs: remove xfs_iread Christoph Hellwig
2020-05-01 15:56 ` Brian Foster [this message]
2020-05-01 8:14 ` [PATCH 08/12] xfs: remove xfs_ifork_ops Christoph Hellwig
2020-05-01 15:56 ` Brian Foster
2020-05-01 16:08 ` Darrick J. Wong
2020-05-01 16:38 ` Christoph Hellwig
2020-05-01 16:50 ` Christoph Hellwig
2020-05-01 18:23 ` Brian Foster
2020-05-07 12:34 ` Christoph Hellwig
2020-05-07 13:43 ` Brian Foster
2020-05-07 16:28 ` Brian Foster
2020-05-07 17:18 ` Christoph Hellwig
2020-05-12 23:50 ` Darrick J. Wong
2020-05-01 8:14 ` [PATCH 09/12] xfs: refactor xfs_inode_verify_forks Christoph Hellwig
2020-05-01 15:57 ` Brian Foster
2020-05-01 16:40 ` Christoph Hellwig
2020-05-01 17:02 ` Brian Foster
2020-05-01 17:08 ` Christoph Hellwig
2020-05-01 8:14 ` [PATCH 10/12] xfs: improve local fork verification Christoph Hellwig
2020-05-01 8:14 ` [PATCH 11/12] xfs: remove the special COW fork handling in xfs_bmapi_read Christoph Hellwig
2020-05-01 15:57 ` Brian Foster
2020-05-01 8:14 ` [PATCH 12/12] xfs: remove the NULL " Christoph Hellwig
2020-05-01 15:58 ` Brian Foster
-- strict thread matches above, loose matches on Subject: below --
2020-05-08 6:34 dinode reading cleanups v2 Christoph Hellwig
2020-05-08 6:34 ` [PATCH 07/12] xfs: remove xfs_iread Christoph Hellwig
2020-05-16 17:43 ` 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=20200501155615.GN40250@bfoster \
--to=bfoster@redhat.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).