| Message ID | 20200312142235.550766-3-hch@lst.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/5] xfs: add a new xfs_sb_version_has_large_dinode helper | expand |
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 >
On Thursday, March 12, 2020 7:52 PM 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. > I don't see any logical issues. Reviewed-by: Chandan Rajendra <chandanrlinux@gmail.com> > 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_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c > index 4be04aeee278..a4757e5e64ca 100644 > --- a/fs/xfs/libxfs/xfs_attr_leaf.c > +++ b/fs/xfs/libxfs/xfs_attr_leaf.c > @@ -537,7 +537,7 @@ xfs_attr_shortform_bytesfit( > int offset; > > /* rounded down */ > - offset = (XFS_LITINO(mp, dp->i_d.di_version) - bytes) >> 3; > + offset = (XFS_LITINO(mp) - bytes) >> 3; > > if (dp->i_d.di_format == XFS_DINODE_FMT_DEV) { > minforkoff = roundup(sizeof(xfs_dev_t), 8) >> 3; > @@ -604,8 +604,7 @@ xfs_attr_shortform_bytesfit( > minforkoff = roundup(minforkoff, 8) >> 3; > > /* attr fork btree root can have at least this many key/ptr pairs */ > - maxforkoff = XFS_LITINO(mp, dp->i_d.di_version) - > - XFS_BMDR_SPACE_CALC(MINABTPTRS); > + maxforkoff = XFS_LITINO(mp) - XFS_BMDR_SPACE_CALC(MINABTPTRS); > maxforkoff = maxforkoff >> 3; /* rounded down */ > > if (offset >= maxforkoff) > diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c > index 43ae2ab21084..a2fe8a585100 100644 > --- a/fs/xfs/libxfs/xfs_bmap.c > +++ b/fs/xfs/libxfs/xfs_bmap.c > @@ -193,14 +193,12 @@ xfs_default_attroffset( > struct xfs_mount *mp = ip->i_mount; > uint offset; > > - if (mp->m_sb.sb_inodesize == 256) { > - offset = XFS_LITINO(mp, ip->i_d.di_version) - > - XFS_BMDR_SPACE_CALC(MINABTPTRS); > - } else { > + if (mp->m_sb.sb_inodesize == 256) > + offset = XFS_LITINO(mp) - XFS_BMDR_SPACE_CALC(MINABTPTRS); > + else > offset = XFS_BMDR_SPACE_CALC(6 * MINABTPTRS); > - } > > - ASSERT(offset < XFS_LITINO(mp, ip->i_d.di_version)); > + ASSERT(offset < XFS_LITINO(mp)); > return offset; > } > > diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h > index a28bf6a978ad..aeca184d63ee 100644 > --- a/fs/xfs/libxfs/xfs_format.h > +++ b/fs/xfs/libxfs/xfs_format.h > @@ -942,8 +942,11 @@ enum xfs_dinode_fmt { > /* > * Inode size for given fs. > */ > -#define XFS_LITINO(mp, version) \ > - ((int)(((mp)->m_sb.sb_inodesize) - xfs_dinode_size(version))) > +#define XFS_DINODE_SIZE(mp) \ > + (xfs_sb_version_has_large_dinode(&(mp)->m_sb) ? \ > + sizeof(struct xfs_dinode) : offsetof(struct xfs_dinode, di_crc)) > +#define XFS_LITINO(mp) \ > + ((mp)->m_sb.sb_inodesize - XFS_DINODE_SIZE(mp)) > > /* > * Inode data & attribute fork sizes, per inode. > @@ -952,13 +955,9 @@ enum xfs_dinode_fmt { > #define XFS_DFORK_BOFF(dip) ((int)((dip)->di_forkoff << 3)) > > #define XFS_DFORK_DSIZE(dip,mp) \ > - (XFS_DFORK_Q(dip) ? \ > - XFS_DFORK_BOFF(dip) : \ > - XFS_LITINO(mp, (dip)->di_version)) > + (XFS_DFORK_Q(dip) ? XFS_DFORK_BOFF(dip) : XFS_LITINO(mp)) > #define XFS_DFORK_ASIZE(dip,mp) \ > - (XFS_DFORK_Q(dip) ? \ > - XFS_LITINO(mp, (dip)->di_version) - XFS_DFORK_BOFF(dip) : \ > - 0) > + (XFS_DFORK_Q(dip) ? XFS_LITINO(mp) - XFS_DFORK_BOFF(dip) : 0) > #define XFS_DFORK_SIZE(dip,mp,w) \ > ((w) == XFS_DATA_FORK ? \ > XFS_DFORK_DSIZE(dip, mp) : \ > diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c > index 6adffaa68fb8..26de817351fa 100644 > --- a/fs/xfs/libxfs/xfs_ialloc.c > +++ b/fs/xfs/libxfs/xfs_ialloc.c > @@ -339,7 +339,7 @@ xfs_ialloc_inode_init( > xfs_buf_zero(fbuf, 0, BBTOB(fbuf->b_length)); > for (i = 0; i < M_IGEO(mp)->inodes_per_cluster; i++) { > int ioffset = i << mp->m_sb.sb_inodelog; > - uint isize = xfs_dinode_size(version); > + uint isize = XFS_DINODE_SIZE(mp); > > free = xfs_make_iptr(mp, fbuf, i); > free->di_magic = cpu_to_be16(XFS_DINODE_MAGIC); > diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c > index a5aa2f220c28..34ccf162abe1 100644 > --- a/fs/xfs/libxfs/xfs_inode_buf.c > +++ b/fs/xfs/libxfs/xfs_inode_buf.c > @@ -432,7 +432,7 @@ xfs_dinode_verify_forkoff( > case XFS_DINODE_FMT_LOCAL: /* fall through ... */ > case XFS_DINODE_FMT_EXTENTS: /* fall through ... */ > case XFS_DINODE_FMT_BTREE: > - if (dip->di_forkoff >= (XFS_LITINO(mp, dip->di_version) >> 3)) > + if (dip->di_forkoff >= (XFS_LITINO(mp) >> 3)) > return __this_address; > break; > default: > 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).", > (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); >
On Mon, Mar 16, 2020 at 09:17:07AM -0400, Brian Foster wrote: > > 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: Yes. XFS_DFORK_SIZE now returns a size_t, so the format strings needs to match.
diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c index 4be04aeee278..a4757e5e64ca 100644 --- a/fs/xfs/libxfs/xfs_attr_leaf.c +++ b/fs/xfs/libxfs/xfs_attr_leaf.c @@ -537,7 +537,7 @@ xfs_attr_shortform_bytesfit( int offset; /* rounded down */ - offset = (XFS_LITINO(mp, dp->i_d.di_version) - bytes) >> 3; + offset = (XFS_LITINO(mp) - bytes) >> 3; if (dp->i_d.di_format == XFS_DINODE_FMT_DEV) { minforkoff = roundup(sizeof(xfs_dev_t), 8) >> 3; @@ -604,8 +604,7 @@ xfs_attr_shortform_bytesfit( minforkoff = roundup(minforkoff, 8) >> 3; /* attr fork btree root can have at least this many key/ptr pairs */ - maxforkoff = XFS_LITINO(mp, dp->i_d.di_version) - - XFS_BMDR_SPACE_CALC(MINABTPTRS); + maxforkoff = XFS_LITINO(mp) - XFS_BMDR_SPACE_CALC(MINABTPTRS); maxforkoff = maxforkoff >> 3; /* rounded down */ if (offset >= maxforkoff) diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index 43ae2ab21084..a2fe8a585100 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -193,14 +193,12 @@ xfs_default_attroffset( struct xfs_mount *mp = ip->i_mount; uint offset; - if (mp->m_sb.sb_inodesize == 256) { - offset = XFS_LITINO(mp, ip->i_d.di_version) - - XFS_BMDR_SPACE_CALC(MINABTPTRS); - } else { + if (mp->m_sb.sb_inodesize == 256) + offset = XFS_LITINO(mp) - XFS_BMDR_SPACE_CALC(MINABTPTRS); + else offset = XFS_BMDR_SPACE_CALC(6 * MINABTPTRS); - } - ASSERT(offset < XFS_LITINO(mp, ip->i_d.di_version)); + ASSERT(offset < XFS_LITINO(mp)); return offset; } diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h index a28bf6a978ad..aeca184d63ee 100644 --- a/fs/xfs/libxfs/xfs_format.h +++ b/fs/xfs/libxfs/xfs_format.h @@ -942,8 +942,11 @@ enum xfs_dinode_fmt { /* * Inode size for given fs. */ -#define XFS_LITINO(mp, version) \ - ((int)(((mp)->m_sb.sb_inodesize) - xfs_dinode_size(version))) +#define XFS_DINODE_SIZE(mp) \ + (xfs_sb_version_has_large_dinode(&(mp)->m_sb) ? \ + sizeof(struct xfs_dinode) : offsetof(struct xfs_dinode, di_crc)) +#define XFS_LITINO(mp) \ + ((mp)->m_sb.sb_inodesize - XFS_DINODE_SIZE(mp)) /* * Inode data & attribute fork sizes, per inode. @@ -952,13 +955,9 @@ enum xfs_dinode_fmt { #define XFS_DFORK_BOFF(dip) ((int)((dip)->di_forkoff << 3)) #define XFS_DFORK_DSIZE(dip,mp) \ - (XFS_DFORK_Q(dip) ? \ - XFS_DFORK_BOFF(dip) : \ - XFS_LITINO(mp, (dip)->di_version)) + (XFS_DFORK_Q(dip) ? XFS_DFORK_BOFF(dip) : XFS_LITINO(mp)) #define XFS_DFORK_ASIZE(dip,mp) \ - (XFS_DFORK_Q(dip) ? \ - XFS_LITINO(mp, (dip)->di_version) - XFS_DFORK_BOFF(dip) : \ - 0) + (XFS_DFORK_Q(dip) ? XFS_LITINO(mp) - XFS_DFORK_BOFF(dip) : 0) #define XFS_DFORK_SIZE(dip,mp,w) \ ((w) == XFS_DATA_FORK ? \ XFS_DFORK_DSIZE(dip, mp) : \ diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c index 6adffaa68fb8..26de817351fa 100644 --- a/fs/xfs/libxfs/xfs_ialloc.c +++ b/fs/xfs/libxfs/xfs_ialloc.c @@ -339,7 +339,7 @@ xfs_ialloc_inode_init( xfs_buf_zero(fbuf, 0, BBTOB(fbuf->b_length)); for (i = 0; i < M_IGEO(mp)->inodes_per_cluster; i++) { int ioffset = i << mp->m_sb.sb_inodelog; - uint isize = xfs_dinode_size(version); + uint isize = XFS_DINODE_SIZE(mp); free = xfs_make_iptr(mp, fbuf, i); free->di_magic = cpu_to_be16(XFS_DINODE_MAGIC); diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c index a5aa2f220c28..34ccf162abe1 100644 --- a/fs/xfs/libxfs/xfs_inode_buf.c +++ b/fs/xfs/libxfs/xfs_inode_buf.c @@ -432,7 +432,7 @@ xfs_dinode_verify_forkoff( case XFS_DINODE_FMT_LOCAL: /* fall through ... */ case XFS_DINODE_FMT_EXTENTS: /* fall through ... */ case XFS_DINODE_FMT_BTREE: - if (dip->di_forkoff >= (XFS_LITINO(mp, dip->di_version) >> 3)) + if (dip->di_forkoff >= (XFS_LITINO(mp) >> 3)) return __this_address; break; default: 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).", (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);
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(-)