From: Brian Foster <bfoster@redhat.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 2/5] xfs: only check the superblock version for dinode size calculation
Date: Mon, 16 Mar 2020 09:17:07 -0400 [thread overview]
Message-ID: <20200316131707.GF12313@bfoster> (raw)
In-Reply-To: <20200312142235.550766-3-hch@lst.de>
On Thu, Mar 12, 2020 at 03:22:32PM +0100, Christoph Hellwig wrote:
> The size of the dinode structure is only dependent on the file system
> version, so instead of checking the individual inode version just use
> the newly added xfs_sb_version_has_large_dinode helper, and simplify
> various calling conventions.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> fs/xfs/libxfs/xfs_attr_leaf.c | 5 ++---
> fs/xfs/libxfs/xfs_bmap.c | 10 ++++------
> fs/xfs/libxfs/xfs_format.h | 15 +++++++--------
> fs/xfs/libxfs/xfs_ialloc.c | 2 +-
> fs/xfs/libxfs/xfs_inode_buf.c | 2 +-
> fs/xfs/libxfs/xfs_inode_fork.c | 2 +-
> fs/xfs/libxfs/xfs_inode_fork.h | 9 ++-------
> fs/xfs/libxfs/xfs_log_format.h | 10 ++++------
> fs/xfs/xfs_inode_item.c | 4 ++--
> fs/xfs/xfs_log_recover.c | 2 +-
> fs/xfs/xfs_symlink.c | 2 +-
> 11 files changed, 26 insertions(+), 37 deletions(-)
>
...
> diff --git a/fs/xfs/libxfs/xfs_inode_fork.c b/fs/xfs/libxfs/xfs_inode_fork.c
> index ad2b9c313fd2..518c6f0ec3a6 100644
> --- a/fs/xfs/libxfs/xfs_inode_fork.c
> +++ b/fs/xfs/libxfs/xfs_inode_fork.c
> @@ -183,7 +183,7 @@ xfs_iformat_local(
> */
> if (unlikely(size > XFS_DFORK_SIZE(dip, ip->i_mount, whichfork))) {
> xfs_warn(ip->i_mount,
> - "corrupt inode %Lu (bad size %d for local fork, size = %d).",
> + "corrupt inode %Lu (bad size %d for local fork, size = %zd).",
Is this here intentionally? Otherwise seems fine:
Reviewed-by: Brian Foster <bfoster@redhat.com>
> (unsigned long long) ip->i_ino, size,
> XFS_DFORK_SIZE(dip, ip->i_mount, whichfork));
> xfs_inode_verifier_error(ip, -EFSCORRUPTED,
> diff --git a/fs/xfs/libxfs/xfs_inode_fork.h b/fs/xfs/libxfs/xfs_inode_fork.h
> index 500333d0101e..668ee942be22 100644
> --- a/fs/xfs/libxfs/xfs_inode_fork.h
> +++ b/fs/xfs/libxfs/xfs_inode_fork.h
> @@ -46,14 +46,9 @@ struct xfs_ifork {
> (ip)->i_afp : \
> (ip)->i_cowfp))
> #define XFS_IFORK_DSIZE(ip) \
> - (XFS_IFORK_Q(ip) ? \
> - XFS_IFORK_BOFF(ip) : \
> - XFS_LITINO((ip)->i_mount, (ip)->i_d.di_version))
> + (XFS_IFORK_Q(ip) ? XFS_IFORK_BOFF(ip) : XFS_LITINO((ip)->i_mount))
> #define XFS_IFORK_ASIZE(ip) \
> - (XFS_IFORK_Q(ip) ? \
> - XFS_LITINO((ip)->i_mount, (ip)->i_d.di_version) - \
> - XFS_IFORK_BOFF(ip) : \
> - 0)
> + (XFS_IFORK_Q(ip) ? XFS_LITINO((ip)->i_mount) - XFS_IFORK_BOFF(ip) : 0)
> #define XFS_IFORK_SIZE(ip,w) \
> ((w) == XFS_DATA_FORK ? \
> XFS_IFORK_DSIZE(ip) : \
> diff --git a/fs/xfs/libxfs/xfs_log_format.h b/fs/xfs/libxfs/xfs_log_format.h
> index 9bac0d2e56dc..76defbea8000 100644
> --- a/fs/xfs/libxfs/xfs_log_format.h
> +++ b/fs/xfs/libxfs/xfs_log_format.h
> @@ -424,12 +424,10 @@ struct xfs_log_dinode {
> /* structure must be padded to 64 bit alignment */
> };
>
> -static inline uint xfs_log_dinode_size(int version)
> -{
> - if (version == 3)
> - return sizeof(struct xfs_log_dinode);
> - return offsetof(struct xfs_log_dinode, di_next_unlinked);
> -}
> +#define xfs_log_dinode_size(mp) \
> + (xfs_sb_version_has_large_dinode(&(mp)->m_sb) ? \
> + sizeof(struct xfs_log_dinode) : \
> + offsetof(struct xfs_log_dinode, di_next_unlinked))
>
> /*
> * Buffer Log Format definitions
> diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
> index f021b55a0301..451f9b6b2806 100644
> --- a/fs/xfs/xfs_inode_item.c
> +++ b/fs/xfs/xfs_inode_item.c
> @@ -125,7 +125,7 @@ xfs_inode_item_size(
>
> *nvecs += 2;
> *nbytes += sizeof(struct xfs_inode_log_format) +
> - xfs_log_dinode_size(ip->i_d.di_version);
> + xfs_log_dinode_size(ip->i_mount);
>
> xfs_inode_item_data_fork_size(iip, nvecs, nbytes);
> if (XFS_IFORK_Q(ip))
> @@ -370,7 +370,7 @@ xfs_inode_item_format_core(
>
> dic = xlog_prepare_iovec(lv, vecp, XLOG_REG_TYPE_ICORE);
> xfs_inode_to_log_dinode(ip, dic, ip->i_itemp->ili_item.li_lsn);
> - xlog_finish_iovec(lv, *vecp, xfs_log_dinode_size(ip->i_d.di_version));
> + xlog_finish_iovec(lv, *vecp, xfs_log_dinode_size(ip->i_mount));
> }
>
> /*
> diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
> index e5e976b5cc11..79fc85a4ff08 100644
> --- a/fs/xfs/xfs_log_recover.c
> +++ b/fs/xfs/xfs_log_recover.c
> @@ -3068,7 +3068,7 @@ xlog_recover_inode_pass2(
> error = -EFSCORRUPTED;
> goto out_release;
> }
> - isize = xfs_log_dinode_size(ldip->di_version);
> + isize = xfs_log_dinode_size(mp);
> if (unlikely(item->ri_buf[1].i_len > isize)) {
> XFS_CORRUPTION_ERROR("xlog_recover_inode_pass2(7)",
> XFS_ERRLEVEL_LOW, mp, ldip,
> diff --git a/fs/xfs/xfs_symlink.c b/fs/xfs/xfs_symlink.c
> index ea42e25ec1bf..fa0fa3c70f1a 100644
> --- a/fs/xfs/xfs_symlink.c
> +++ b/fs/xfs/xfs_symlink.c
> @@ -192,7 +192,7 @@ xfs_symlink(
> * The symlink will fit into the inode data fork?
> * There can't be any attributes so we get the whole variable part.
> */
> - if (pathlen <= XFS_LITINO(mp, dp->i_d.di_version))
> + if (pathlen <= XFS_LITINO(mp))
> fs_blocks = 0;
> else
> fs_blocks = xfs_symlink_blocks(mp, pathlen);
> --
> 2.24.1
>
next prev parent reply other threads:[~2020-03-16 13:17 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-12 14:22 remove the di_version icdicone field v2 Christoph Hellwig
2020-03-12 14:22 ` [PATCH 1/5] xfs: add a new xfs_sb_version_has_large_dinode helper Christoph Hellwig
2020-03-16 13:16 ` Brian Foster
2020-03-16 14:47 ` Christoph Hellwig
2020-03-16 14:51 ` Darrick J. Wong
2020-03-16 14:46 ` Chandan Rajendra
2020-03-12 14:22 ` [PATCH 2/5] xfs: only check the superblock version for dinode size calculation Christoph Hellwig
2020-03-16 13:17 ` Brian Foster [this message]
2020-03-16 14:48 ` Christoph Hellwig
2020-03-16 14:47 ` Chandan Rajendra
2020-03-12 14:22 ` [PATCH 3/5] xfs: simplify a check in xfs_ioctl_setattr_check_cowextsize Christoph Hellwig
2020-03-16 13:17 ` Brian Foster
2020-03-16 14:48 ` Chandan Rajendra
2020-03-12 14:22 ` [PATCH 4/5] xfs: simplify di_flags2 inheritance in xfs_ialloc Christoph Hellwig
2020-03-16 13:17 ` Brian Foster
2020-03-16 14:48 ` Chandan Rajendra
2020-03-12 14:22 ` [PATCH 5/5] xfs: remove the di_version field from struct icdinode Christoph Hellwig
2020-03-16 13:17 ` Brian Foster
2020-03-16 14:49 ` Chandan Rajendra
-- strict thread matches above, loose matches on Subject: below --
2020-03-17 18:57 remove the di_version icdinode field v3 Christoph Hellwig
2020-03-17 18:57 ` [PATCH 2/5] xfs: only check the superblock version for dinode size calculation Christoph Hellwig
2020-03-18 15:32 ` 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=20200316131707.GF12313@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).