| Message ID | 20200620071102.462554-11-hch@lst.de (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | [01/15] xfs: don't clear the "dinode core" in xfs_inode_alloc | expand |
On Saturday 20 June 2020 12:40:57 PM IST Christoph Hellwig wrote: > In preparation of removing the historic icinode struct, move the > forkoff field into the containing xfs_inode structure. > The changes look good to me. Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com> > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > fs/xfs/libxfs/xfs_attr_leaf.c | 22 +++++++++++----------- > fs/xfs/libxfs/xfs_bmap.c | 32 ++++++++++++++++---------------- > fs/xfs/libxfs/xfs_inode_buf.c | 4 ++-- > fs/xfs/libxfs/xfs_inode_buf.h | 1 - > fs/xfs/libxfs/xfs_inode_fork.h | 4 ++-- > fs/xfs/xfs_icache.c | 2 +- > fs/xfs/xfs_inode.c | 8 ++++---- > fs/xfs/xfs_inode.h | 1 + > fs/xfs/xfs_inode_item.c | 2 +- > 9 files changed, 38 insertions(+), 38 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c > index 2f7e89e4be3e3f..3dca59de331fdf 100644 > --- a/fs/xfs/libxfs/xfs_attr_leaf.c > +++ b/fs/xfs/libxfs/xfs_attr_leaf.c > @@ -518,10 +518,10 @@ xfs_attr_copy_value( > * Query whether the requested number of additional bytes of extended > * attribute space will be able to fit inline. > * > - * Returns zero if not, else the di_forkoff fork offset to be used in the > + * Returns zero if not, else the i_forkoff fork offset to be used in the > * literal area for attribute data once the new bytes have been added. > * > - * di_forkoff must be 8 byte aligned, hence is stored as a >>3 value; > + * i_forkoff must be 8 byte aligned, hence is stored as a >>3 value; > * special case for dev/uuid inodes, they have fixed size data forks. > */ > int > @@ -554,7 +554,7 @@ xfs_attr_shortform_bytesfit( > * literal area rebalancing. > */ > if (bytes <= XFS_IFORK_ASIZE(dp)) > - return dp->i_d.di_forkoff; > + return dp->i_forkoff; > > /* > * For attr2 we can try to move the forkoff if there is space in the > @@ -575,7 +575,7 @@ xfs_attr_shortform_bytesfit( > * minimum offset only needs to be the space required for > * the btree root. > */ > - if (!dp->i_d.di_forkoff && dp->i_df.if_bytes > > + if (!dp->i_forkoff && dp->i_df.if_bytes > > xfs_default_attroffset(dp)) > dsize = XFS_BMDR_SPACE_CALC(MINDBTPTRS); > break; > @@ -586,10 +586,10 @@ xfs_attr_shortform_bytesfit( > * minforkoff to where the btree root can finish so we have > * plenty of room for attrs > */ > - if (dp->i_d.di_forkoff) { > - if (offset < dp->i_d.di_forkoff) > + if (dp->i_forkoff) { > + if (offset < dp->i_forkoff) > return 0; > - return dp->i_d.di_forkoff; > + return dp->i_forkoff; > } > dsize = XFS_BMAP_BROOT_SPACE(mp, dp->i_df.if_broot); > break; > @@ -677,7 +677,7 @@ xfs_attr_shortform_add(xfs_da_args_t *args, int forkoff) > > dp = args->dp; > mp = dp->i_mount; > - dp->i_d.di_forkoff = forkoff; > + dp->i_forkoff = forkoff; > > ifp = dp->i_afp; > ASSERT(ifp->if_flags & XFS_IFINLINE); > @@ -720,7 +720,7 @@ xfs_attr_fork_remove( > xfs_idestroy_fork(ip->i_afp); > kmem_cache_free(xfs_ifork_zone, ip->i_afp); > ip->i_afp = NULL; > - ip->i_d.di_forkoff = 0; > + ip->i_forkoff = 0; > xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); > } > > @@ -775,8 +775,8 @@ xfs_attr_shortform_remove(xfs_da_args_t *args) > xfs_attr_fork_remove(dp, args->trans); > } else { > xfs_idata_realloc(dp, -size, XFS_ATTR_FORK); > - dp->i_d.di_forkoff = xfs_attr_shortform_bytesfit(dp, totsize); > - ASSERT(dp->i_d.di_forkoff); > + dp->i_forkoff = xfs_attr_shortform_bytesfit(dp, totsize); > + ASSERT(dp->i_forkoff); > ASSERT(totsize > sizeof(xfs_attr_sf_hdr_t) || > (args->op_flags & XFS_DA_OP_ADDNAME) || > !(mp->m_flags & XFS_MOUNT_ATTR2) || > diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c > index 692159357ed8e5..7e7e4459a606f1 100644 > --- a/fs/xfs/libxfs/xfs_bmap.c > +++ b/fs/xfs/libxfs/xfs_bmap.c > @@ -66,13 +66,13 @@ xfs_bmap_compute_maxlevels( > * either a signed 32-bit number for the data fork, or a signed 16-bit > * number for the attr fork. > * > - * Note that we can no longer assume that if we are in ATTR1 that > - * the fork offset of all the inodes will be > - * (xfs_default_attroffset(ip) >> 3) because we could have mounted > - * with ATTR2 and then mounted back with ATTR1, keeping the > - * di_forkoff's fixed but probably at various positions. Therefore, > - * for both ATTR1 and ATTR2 we have to assume the worst case scenario > - * of a minimum size available. > + * Note that we can no longer assume that if we are in ATTR1 that the > + * fork offset of all the inodes will be > + * (xfs_default_attroffset(ip) >> 3) because we could have mounted with > + * ATTR2 and then mounted back with ATTR1, keeping the i_forkoff's fixed > + * but probably at various positions. Therefore, for both ATTR1 and > + * ATTR2 we have to assume the worst case scenario of a minimum size > + * available. > */ > if (whichfork == XFS_DATA_FORK) { > maxleafents = MAXEXTNUM; > @@ -205,9 +205,9 @@ xfs_default_attroffset( > } > > /* > - * Helper routine to reset inode di_forkoff field when switching > - * attribute fork from local to extent format - we reset it where > - * possible to make space available for inline data fork extents. > + * Helper routine to reset inode i_forkoff field when switching attribute fork > + * from local to extent format - we reset it where possible to make space > + * available for inline data fork extents. > */ > STATIC void > xfs_bmap_forkoff_reset( > @@ -219,8 +219,8 @@ xfs_bmap_forkoff_reset( > ip->i_df.if_format != XFS_DINODE_FMT_BTREE) { > uint dfl_forkoff = xfs_default_attroffset(ip) >> 3; > > - if (dfl_forkoff > ip->i_d.di_forkoff) > - ip->i_d.di_forkoff = dfl_forkoff; > + if (dfl_forkoff > ip->i_forkoff) > + ip->i_forkoff = dfl_forkoff; > } > } > > @@ -1035,14 +1035,14 @@ xfs_bmap_set_attrforkoff( > { > switch (ip->i_df.if_format) { > case XFS_DINODE_FMT_DEV: > - ip->i_d.di_forkoff = roundup(sizeof(xfs_dev_t), 8) >> 3; > + ip->i_forkoff = roundup(sizeof(xfs_dev_t), 8) >> 3; > break; > case XFS_DINODE_FMT_LOCAL: > case XFS_DINODE_FMT_EXTENTS: > case XFS_DINODE_FMT_BTREE: > - ip->i_d.di_forkoff = xfs_attr_shortform_bytesfit(ip, size); > - if (!ip->i_d.di_forkoff) > - ip->i_d.di_forkoff = xfs_default_attroffset(ip) >> 3; > + ip->i_forkoff = xfs_attr_shortform_bytesfit(ip, size); > + if (!ip->i_forkoff) > + ip->i_forkoff = xfs_default_attroffset(ip) >> 3; > else if ((ip->i_mount->m_flags & XFS_MOUNT_ATTR2) && version) > *version = 2; > break; > diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c > index 8c4b7bd69285fa..69a6844b1698d0 100644 > --- a/fs/xfs/libxfs/xfs_inode_buf.c > +++ b/fs/xfs/libxfs/xfs_inode_buf.c > @@ -245,7 +245,7 @@ xfs_inode_from_disk( > ip->i_disk_size = be64_to_cpu(from->di_size); > ip->i_nblocks = be64_to_cpu(from->di_nblocks); > ip->i_extsize = be32_to_cpu(from->di_extsize); > - to->di_forkoff = from->di_forkoff; > + ip->i_forkoff = from->di_forkoff; > to->di_dmevmask = be32_to_cpu(from->di_dmevmask); > to->di_dmstate = be16_to_cpu(from->di_dmstate); > to->di_flags = be16_to_cpu(from->di_flags); > @@ -310,7 +310,7 @@ xfs_inode_to_disk( > to->di_extsize = cpu_to_be32(ip->i_extsize); > to->di_nextents = cpu_to_be32(xfs_ifork_nextents(&ip->i_df)); > to->di_anextents = cpu_to_be16(xfs_ifork_nextents(ip->i_afp)); > - to->di_forkoff = from->di_forkoff; > + to->di_forkoff = ip->i_forkoff; > to->di_aformat = xfs_ifork_format(ip->i_afp); > to->di_dmevmask = cpu_to_be32(from->di_dmevmask); > to->di_dmstate = cpu_to_be16(from->di_dmstate); > diff --git a/fs/xfs/libxfs/xfs_inode_buf.h b/fs/xfs/libxfs/xfs_inode_buf.h > index 8cc96f2766ff4f..032486dbf82757 100644 > --- a/fs/xfs/libxfs/xfs_inode_buf.h > +++ b/fs/xfs/libxfs/xfs_inode_buf.h > @@ -16,7 +16,6 @@ struct xfs_dinode; > * format specific structures at the appropriate time. > */ > struct xfs_icdinode { > - uint8_t di_forkoff; /* attr fork offs, <<3 for 64b align */ > uint32_t di_dmevmask; /* DMIG event mask */ > uint16_t di_dmstate; /* DMIG state info */ > uint16_t di_flags; /* random flags, XFS_DIFLAG_... */ > diff --git a/fs/xfs/libxfs/xfs_inode_fork.h b/fs/xfs/libxfs/xfs_inode_fork.h > index a4953e95c4f3f6..7d6982b23446c2 100644 > --- a/fs/xfs/libxfs/xfs_inode_fork.h > +++ b/fs/xfs/libxfs/xfs_inode_fork.h > @@ -38,8 +38,8 @@ struct xfs_ifork { > * Fork handling. > */ > > -#define XFS_IFORK_Q(ip) ((ip)->i_d.di_forkoff != 0) > -#define XFS_IFORK_BOFF(ip) ((int)((ip)->i_d.di_forkoff << 3)) > +#define XFS_IFORK_Q(ip) ((ip)->i_forkoff != 0) > +#define XFS_IFORK_BOFF(ip) ((int)((ip)->i_forkoff << 3)) > > #define XFS_IFORK_PTR(ip,w) \ > ((w) == XFS_DATA_FORK ? \ > diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c > index e6b40f7035aa5a..ccd437432aa963 100644 > --- a/fs/xfs/xfs_icache.c > +++ b/fs/xfs/xfs_icache.c > @@ -67,7 +67,7 @@ xfs_inode_alloc( > ip->i_flags = 0; > ip->i_delayed_blks = 0; > ip->i_nblocks = 0; > - ip->i_d.di_forkoff = 0; > + ip->i_forkoff = 0; > ip->i_sick = 0; > ip->i_checked = 0; > INIT_WORK(&ip->i_ioend_work, xfs_end_io); > diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c > index fd111e05c0bb2e..764f91610d1496 100644 > --- a/fs/xfs/xfs_inode.c > +++ b/fs/xfs/xfs_inode.c > @@ -1858,7 +1858,7 @@ xfs_inactive( > } > > ASSERT(!ip->i_afp); > - ASSERT(ip->i_d.di_forkoff == 0); > + ASSERT(ip->i_forkoff == 0); > > /* > * Free the inode. > @@ -2758,7 +2758,7 @@ xfs_ifree( > ip->i_d.di_flags = 0; > ip->i_d.di_flags2 = 0; > ip->i_d.di_dmevmask = 0; > - ip->i_d.di_forkoff = 0; /* mark the attr fork not in use */ > + ip->i_forkoff = 0; /* mark the attr fork not in use */ > ip->i_df.if_format = XFS_DINODE_FMT_EXTENTS; > > /* Don't attempt to replay owner changes for a deleted inode */ > @@ -3756,11 +3756,11 @@ xfs_iflush_int( > ip->i_nblocks, ip); > goto flush_out; > } > - if (XFS_TEST_ERROR(ip->i_d.di_forkoff > mp->m_sb.sb_inodesize, > + if (XFS_TEST_ERROR(ip->i_forkoff > mp->m_sb.sb_inodesize, > mp, XFS_ERRTAG_IFLUSH_6)) { > xfs_alert_tag(mp, XFS_PTAG_IFLUSH, > "%s: bad inode %Lu, forkoff 0x%x, ptr "PTR_FMT, > - __func__, ip->i_ino, ip->i_d.di_forkoff, ip); > + __func__, ip->i_ino, ip->i_forkoff, ip); > goto flush_out; > } > > diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h > index a0444b9ce3f792..31440ab88cf141 100644 > --- a/fs/xfs/xfs_inode.h > +++ b/fs/xfs/xfs_inode.h > @@ -63,6 +63,7 @@ typedef struct xfs_inode { > xfs_extlen_t i_cowextsize; /* basic cow extent size */ > uint16_t i_flushiter; /* incremented on flush */ > }; > + uint8_t i_forkoff; /* attr fork offset >> 3 */ > > struct xfs_icdinode i_d; /* most of ondisk inode */ > > diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c > index 8357fe37d3eb8a..a83ddc4e029f0f 100644 > --- a/fs/xfs/xfs_inode_item.c > +++ b/fs/xfs/xfs_inode_item.c > @@ -328,7 +328,7 @@ xfs_inode_to_log_dinode( > to->di_extsize = ip->i_extsize; > to->di_nextents = xfs_ifork_nextents(&ip->i_df); > to->di_anextents = xfs_ifork_nextents(ip->i_afp); > - to->di_forkoff = from->di_forkoff; > + to->di_forkoff = ip->i_forkoff; > to->di_aformat = xfs_ifork_format(ip->i_afp); > to->di_dmevmask = from->di_dmevmask; > to->di_dmstate = from->di_dmstate; >
On Sat, Jun 20, 2020 at 09:10:57AM +0200, Christoph Hellwig wrote: > In preparation of removing the historic icinode struct, move the > forkoff field into the containing xfs_inode structure. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Nice conversion, Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > --- > fs/xfs/libxfs/xfs_attr_leaf.c | 22 +++++++++++----------- > fs/xfs/libxfs/xfs_bmap.c | 32 ++++++++++++++++---------------- > fs/xfs/libxfs/xfs_inode_buf.c | 4 ++-- > fs/xfs/libxfs/xfs_inode_buf.h | 1 - > fs/xfs/libxfs/xfs_inode_fork.h | 4 ++-- > fs/xfs/xfs_icache.c | 2 +- > fs/xfs/xfs_inode.c | 8 ++++---- > fs/xfs/xfs_inode.h | 1 + > fs/xfs/xfs_inode_item.c | 2 +- > 9 files changed, 38 insertions(+), 38 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c > index 2f7e89e4be3e3f..3dca59de331fdf 100644 > --- a/fs/xfs/libxfs/xfs_attr_leaf.c > +++ b/fs/xfs/libxfs/xfs_attr_leaf.c > @@ -518,10 +518,10 @@ xfs_attr_copy_value( > * Query whether the requested number of additional bytes of extended > * attribute space will be able to fit inline. > * > - * Returns zero if not, else the di_forkoff fork offset to be used in the > + * Returns zero if not, else the i_forkoff fork offset to be used in the > * literal area for attribute data once the new bytes have been added. > * > - * di_forkoff must be 8 byte aligned, hence is stored as a >>3 value; > + * i_forkoff must be 8 byte aligned, hence is stored as a >>3 value; > * special case for dev/uuid inodes, they have fixed size data forks. > */ > int > @@ -554,7 +554,7 @@ xfs_attr_shortform_bytesfit( > * literal area rebalancing. > */ > if (bytes <= XFS_IFORK_ASIZE(dp)) > - return dp->i_d.di_forkoff; > + return dp->i_forkoff; > > /* > * For attr2 we can try to move the forkoff if there is space in the > @@ -575,7 +575,7 @@ xfs_attr_shortform_bytesfit( > * minimum offset only needs to be the space required for > * the btree root. > */ > - if (!dp->i_d.di_forkoff && dp->i_df.if_bytes > > + if (!dp->i_forkoff && dp->i_df.if_bytes > > xfs_default_attroffset(dp)) > dsize = XFS_BMDR_SPACE_CALC(MINDBTPTRS); > break; > @@ -586,10 +586,10 @@ xfs_attr_shortform_bytesfit( > * minforkoff to where the btree root can finish so we have > * plenty of room for attrs > */ > - if (dp->i_d.di_forkoff) { > - if (offset < dp->i_d.di_forkoff) > + if (dp->i_forkoff) { > + if (offset < dp->i_forkoff) > return 0; > - return dp->i_d.di_forkoff; > + return dp->i_forkoff; > } > dsize = XFS_BMAP_BROOT_SPACE(mp, dp->i_df.if_broot); > break; > @@ -677,7 +677,7 @@ xfs_attr_shortform_add(xfs_da_args_t *args, int forkoff) > > dp = args->dp; > mp = dp->i_mount; > - dp->i_d.di_forkoff = forkoff; > + dp->i_forkoff = forkoff; > > ifp = dp->i_afp; > ASSERT(ifp->if_flags & XFS_IFINLINE); > @@ -720,7 +720,7 @@ xfs_attr_fork_remove( > xfs_idestroy_fork(ip->i_afp); > kmem_cache_free(xfs_ifork_zone, ip->i_afp); > ip->i_afp = NULL; > - ip->i_d.di_forkoff = 0; > + ip->i_forkoff = 0; > xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); > } > > @@ -775,8 +775,8 @@ xfs_attr_shortform_remove(xfs_da_args_t *args) > xfs_attr_fork_remove(dp, args->trans); > } else { > xfs_idata_realloc(dp, -size, XFS_ATTR_FORK); > - dp->i_d.di_forkoff = xfs_attr_shortform_bytesfit(dp, totsize); > - ASSERT(dp->i_d.di_forkoff); > + dp->i_forkoff = xfs_attr_shortform_bytesfit(dp, totsize); > + ASSERT(dp->i_forkoff); > ASSERT(totsize > sizeof(xfs_attr_sf_hdr_t) || > (args->op_flags & XFS_DA_OP_ADDNAME) || > !(mp->m_flags & XFS_MOUNT_ATTR2) || > diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c > index 692159357ed8e5..7e7e4459a606f1 100644 > --- a/fs/xfs/libxfs/xfs_bmap.c > +++ b/fs/xfs/libxfs/xfs_bmap.c > @@ -66,13 +66,13 @@ xfs_bmap_compute_maxlevels( > * either a signed 32-bit number for the data fork, or a signed 16-bit > * number for the attr fork. > * > - * Note that we can no longer assume that if we are in ATTR1 that > - * the fork offset of all the inodes will be > - * (xfs_default_attroffset(ip) >> 3) because we could have mounted > - * with ATTR2 and then mounted back with ATTR1, keeping the > - * di_forkoff's fixed but probably at various positions. Therefore, > - * for both ATTR1 and ATTR2 we have to assume the worst case scenario > - * of a minimum size available. > + * Note that we can no longer assume that if we are in ATTR1 that the > + * fork offset of all the inodes will be > + * (xfs_default_attroffset(ip) >> 3) because we could have mounted with > + * ATTR2 and then mounted back with ATTR1, keeping the i_forkoff's fixed > + * but probably at various positions. Therefore, for both ATTR1 and > + * ATTR2 we have to assume the worst case scenario of a minimum size > + * available. > */ > if (whichfork == XFS_DATA_FORK) { > maxleafents = MAXEXTNUM; > @@ -205,9 +205,9 @@ xfs_default_attroffset( > } > > /* > - * Helper routine to reset inode di_forkoff field when switching > - * attribute fork from local to extent format - we reset it where > - * possible to make space available for inline data fork extents. > + * Helper routine to reset inode i_forkoff field when switching attribute fork > + * from local to extent format - we reset it where possible to make space > + * available for inline data fork extents. > */ > STATIC void > xfs_bmap_forkoff_reset( > @@ -219,8 +219,8 @@ xfs_bmap_forkoff_reset( > ip->i_df.if_format != XFS_DINODE_FMT_BTREE) { > uint dfl_forkoff = xfs_default_attroffset(ip) >> 3; > > - if (dfl_forkoff > ip->i_d.di_forkoff) > - ip->i_d.di_forkoff = dfl_forkoff; > + if (dfl_forkoff > ip->i_forkoff) > + ip->i_forkoff = dfl_forkoff; > } > } > > @@ -1035,14 +1035,14 @@ xfs_bmap_set_attrforkoff( > { > switch (ip->i_df.if_format) { > case XFS_DINODE_FMT_DEV: > - ip->i_d.di_forkoff = roundup(sizeof(xfs_dev_t), 8) >> 3; > + ip->i_forkoff = roundup(sizeof(xfs_dev_t), 8) >> 3; > break; > case XFS_DINODE_FMT_LOCAL: > case XFS_DINODE_FMT_EXTENTS: > case XFS_DINODE_FMT_BTREE: > - ip->i_d.di_forkoff = xfs_attr_shortform_bytesfit(ip, size); > - if (!ip->i_d.di_forkoff) > - ip->i_d.di_forkoff = xfs_default_attroffset(ip) >> 3; > + ip->i_forkoff = xfs_attr_shortform_bytesfit(ip, size); > + if (!ip->i_forkoff) > + ip->i_forkoff = xfs_default_attroffset(ip) >> 3; > else if ((ip->i_mount->m_flags & XFS_MOUNT_ATTR2) && version) > *version = 2; > break; > diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c > index 8c4b7bd69285fa..69a6844b1698d0 100644 > --- a/fs/xfs/libxfs/xfs_inode_buf.c > +++ b/fs/xfs/libxfs/xfs_inode_buf.c > @@ -245,7 +245,7 @@ xfs_inode_from_disk( > ip->i_disk_size = be64_to_cpu(from->di_size); > ip->i_nblocks = be64_to_cpu(from->di_nblocks); > ip->i_extsize = be32_to_cpu(from->di_extsize); > - to->di_forkoff = from->di_forkoff; > + ip->i_forkoff = from->di_forkoff; > to->di_dmevmask = be32_to_cpu(from->di_dmevmask); > to->di_dmstate = be16_to_cpu(from->di_dmstate); > to->di_flags = be16_to_cpu(from->di_flags); > @@ -310,7 +310,7 @@ xfs_inode_to_disk( > to->di_extsize = cpu_to_be32(ip->i_extsize); > to->di_nextents = cpu_to_be32(xfs_ifork_nextents(&ip->i_df)); > to->di_anextents = cpu_to_be16(xfs_ifork_nextents(ip->i_afp)); > - to->di_forkoff = from->di_forkoff; > + to->di_forkoff = ip->i_forkoff; > to->di_aformat = xfs_ifork_format(ip->i_afp); > to->di_dmevmask = cpu_to_be32(from->di_dmevmask); > to->di_dmstate = cpu_to_be16(from->di_dmstate); > diff --git a/fs/xfs/libxfs/xfs_inode_buf.h b/fs/xfs/libxfs/xfs_inode_buf.h > index 8cc96f2766ff4f..032486dbf82757 100644 > --- a/fs/xfs/libxfs/xfs_inode_buf.h > +++ b/fs/xfs/libxfs/xfs_inode_buf.h > @@ -16,7 +16,6 @@ struct xfs_dinode; > * format specific structures at the appropriate time. > */ > struct xfs_icdinode { > - uint8_t di_forkoff; /* attr fork offs, <<3 for 64b align */ > uint32_t di_dmevmask; /* DMIG event mask */ > uint16_t di_dmstate; /* DMIG state info */ > uint16_t di_flags; /* random flags, XFS_DIFLAG_... */ > diff --git a/fs/xfs/libxfs/xfs_inode_fork.h b/fs/xfs/libxfs/xfs_inode_fork.h > index a4953e95c4f3f6..7d6982b23446c2 100644 > --- a/fs/xfs/libxfs/xfs_inode_fork.h > +++ b/fs/xfs/libxfs/xfs_inode_fork.h > @@ -38,8 +38,8 @@ struct xfs_ifork { > * Fork handling. > */ > > -#define XFS_IFORK_Q(ip) ((ip)->i_d.di_forkoff != 0) > -#define XFS_IFORK_BOFF(ip) ((int)((ip)->i_d.di_forkoff << 3)) > +#define XFS_IFORK_Q(ip) ((ip)->i_forkoff != 0) > +#define XFS_IFORK_BOFF(ip) ((int)((ip)->i_forkoff << 3)) > > #define XFS_IFORK_PTR(ip,w) \ > ((w) == XFS_DATA_FORK ? \ > diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c > index e6b40f7035aa5a..ccd437432aa963 100644 > --- a/fs/xfs/xfs_icache.c > +++ b/fs/xfs/xfs_icache.c > @@ -67,7 +67,7 @@ xfs_inode_alloc( > ip->i_flags = 0; > ip->i_delayed_blks = 0; > ip->i_nblocks = 0; > - ip->i_d.di_forkoff = 0; > + ip->i_forkoff = 0; > ip->i_sick = 0; > ip->i_checked = 0; > INIT_WORK(&ip->i_ioend_work, xfs_end_io); > diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c > index fd111e05c0bb2e..764f91610d1496 100644 > --- a/fs/xfs/xfs_inode.c > +++ b/fs/xfs/xfs_inode.c > @@ -1858,7 +1858,7 @@ xfs_inactive( > } > > ASSERT(!ip->i_afp); > - ASSERT(ip->i_d.di_forkoff == 0); > + ASSERT(ip->i_forkoff == 0); > > /* > * Free the inode. > @@ -2758,7 +2758,7 @@ xfs_ifree( > ip->i_d.di_flags = 0; > ip->i_d.di_flags2 = 0; > ip->i_d.di_dmevmask = 0; > - ip->i_d.di_forkoff = 0; /* mark the attr fork not in use */ > + ip->i_forkoff = 0; /* mark the attr fork not in use */ > ip->i_df.if_format = XFS_DINODE_FMT_EXTENTS; > > /* Don't attempt to replay owner changes for a deleted inode */ > @@ -3756,11 +3756,11 @@ xfs_iflush_int( > ip->i_nblocks, ip); > goto flush_out; > } > - if (XFS_TEST_ERROR(ip->i_d.di_forkoff > mp->m_sb.sb_inodesize, > + if (XFS_TEST_ERROR(ip->i_forkoff > mp->m_sb.sb_inodesize, > mp, XFS_ERRTAG_IFLUSH_6)) { > xfs_alert_tag(mp, XFS_PTAG_IFLUSH, > "%s: bad inode %Lu, forkoff 0x%x, ptr "PTR_FMT, > - __func__, ip->i_ino, ip->i_d.di_forkoff, ip); > + __func__, ip->i_ino, ip->i_forkoff, ip); > goto flush_out; > } > > diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h > index a0444b9ce3f792..31440ab88cf141 100644 > --- a/fs/xfs/xfs_inode.h > +++ b/fs/xfs/xfs_inode.h > @@ -63,6 +63,7 @@ typedef struct xfs_inode { > xfs_extlen_t i_cowextsize; /* basic cow extent size */ > uint16_t i_flushiter; /* incremented on flush */ > }; > + uint8_t i_forkoff; /* attr fork offset >> 3 */ > > struct xfs_icdinode i_d; /* most of ondisk inode */ > > diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c > index 8357fe37d3eb8a..a83ddc4e029f0f 100644 > --- a/fs/xfs/xfs_inode_item.c > +++ b/fs/xfs/xfs_inode_item.c > @@ -328,7 +328,7 @@ xfs_inode_to_log_dinode( > to->di_extsize = ip->i_extsize; > to->di_nextents = xfs_ifork_nextents(&ip->i_df); > to->di_anextents = xfs_ifork_nextents(ip->i_afp); > - to->di_forkoff = from->di_forkoff; > + to->di_forkoff = ip->i_forkoff; > to->di_aformat = xfs_ifork_format(ip->i_afp); > to->di_dmevmask = from->di_dmevmask; > to->di_dmstate = from->di_dmstate; > -- > 2.26.2 >
diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c index 2f7e89e4be3e3f..3dca59de331fdf 100644 --- a/fs/xfs/libxfs/xfs_attr_leaf.c +++ b/fs/xfs/libxfs/xfs_attr_leaf.c @@ -518,10 +518,10 @@ xfs_attr_copy_value( * Query whether the requested number of additional bytes of extended * attribute space will be able to fit inline. * - * Returns zero if not, else the di_forkoff fork offset to be used in the + * Returns zero if not, else the i_forkoff fork offset to be used in the * literal area for attribute data once the new bytes have been added. * - * di_forkoff must be 8 byte aligned, hence is stored as a >>3 value; + * i_forkoff must be 8 byte aligned, hence is stored as a >>3 value; * special case for dev/uuid inodes, they have fixed size data forks. */ int @@ -554,7 +554,7 @@ xfs_attr_shortform_bytesfit( * literal area rebalancing. */ if (bytes <= XFS_IFORK_ASIZE(dp)) - return dp->i_d.di_forkoff; + return dp->i_forkoff; /* * For attr2 we can try to move the forkoff if there is space in the @@ -575,7 +575,7 @@ xfs_attr_shortform_bytesfit( * minimum offset only needs to be the space required for * the btree root. */ - if (!dp->i_d.di_forkoff && dp->i_df.if_bytes > + if (!dp->i_forkoff && dp->i_df.if_bytes > xfs_default_attroffset(dp)) dsize = XFS_BMDR_SPACE_CALC(MINDBTPTRS); break; @@ -586,10 +586,10 @@ xfs_attr_shortform_bytesfit( * minforkoff to where the btree root can finish so we have * plenty of room for attrs */ - if (dp->i_d.di_forkoff) { - if (offset < dp->i_d.di_forkoff) + if (dp->i_forkoff) { + if (offset < dp->i_forkoff) return 0; - return dp->i_d.di_forkoff; + return dp->i_forkoff; } dsize = XFS_BMAP_BROOT_SPACE(mp, dp->i_df.if_broot); break; @@ -677,7 +677,7 @@ xfs_attr_shortform_add(xfs_da_args_t *args, int forkoff) dp = args->dp; mp = dp->i_mount; - dp->i_d.di_forkoff = forkoff; + dp->i_forkoff = forkoff; ifp = dp->i_afp; ASSERT(ifp->if_flags & XFS_IFINLINE); @@ -720,7 +720,7 @@ xfs_attr_fork_remove( xfs_idestroy_fork(ip->i_afp); kmem_cache_free(xfs_ifork_zone, ip->i_afp); ip->i_afp = NULL; - ip->i_d.di_forkoff = 0; + ip->i_forkoff = 0; xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); } @@ -775,8 +775,8 @@ xfs_attr_shortform_remove(xfs_da_args_t *args) xfs_attr_fork_remove(dp, args->trans); } else { xfs_idata_realloc(dp, -size, XFS_ATTR_FORK); - dp->i_d.di_forkoff = xfs_attr_shortform_bytesfit(dp, totsize); - ASSERT(dp->i_d.di_forkoff); + dp->i_forkoff = xfs_attr_shortform_bytesfit(dp, totsize); + ASSERT(dp->i_forkoff); ASSERT(totsize > sizeof(xfs_attr_sf_hdr_t) || (args->op_flags & XFS_DA_OP_ADDNAME) || !(mp->m_flags & XFS_MOUNT_ATTR2) || diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index 692159357ed8e5..7e7e4459a606f1 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -66,13 +66,13 @@ xfs_bmap_compute_maxlevels( * either a signed 32-bit number for the data fork, or a signed 16-bit * number for the attr fork. * - * Note that we can no longer assume that if we are in ATTR1 that - * the fork offset of all the inodes will be - * (xfs_default_attroffset(ip) >> 3) because we could have mounted - * with ATTR2 and then mounted back with ATTR1, keeping the - * di_forkoff's fixed but probably at various positions. Therefore, - * for both ATTR1 and ATTR2 we have to assume the worst case scenario - * of a minimum size available. + * Note that we can no longer assume that if we are in ATTR1 that the + * fork offset of all the inodes will be + * (xfs_default_attroffset(ip) >> 3) because we could have mounted with + * ATTR2 and then mounted back with ATTR1, keeping the i_forkoff's fixed + * but probably at various positions. Therefore, for both ATTR1 and + * ATTR2 we have to assume the worst case scenario of a minimum size + * available. */ if (whichfork == XFS_DATA_FORK) { maxleafents = MAXEXTNUM; @@ -205,9 +205,9 @@ xfs_default_attroffset( } /* - * Helper routine to reset inode di_forkoff field when switching - * attribute fork from local to extent format - we reset it where - * possible to make space available for inline data fork extents. + * Helper routine to reset inode i_forkoff field when switching attribute fork + * from local to extent format - we reset it where possible to make space + * available for inline data fork extents. */ STATIC void xfs_bmap_forkoff_reset( @@ -219,8 +219,8 @@ xfs_bmap_forkoff_reset( ip->i_df.if_format != XFS_DINODE_FMT_BTREE) { uint dfl_forkoff = xfs_default_attroffset(ip) >> 3; - if (dfl_forkoff > ip->i_d.di_forkoff) - ip->i_d.di_forkoff = dfl_forkoff; + if (dfl_forkoff > ip->i_forkoff) + ip->i_forkoff = dfl_forkoff; } } @@ -1035,14 +1035,14 @@ xfs_bmap_set_attrforkoff( { switch (ip->i_df.if_format) { case XFS_DINODE_FMT_DEV: - ip->i_d.di_forkoff = roundup(sizeof(xfs_dev_t), 8) >> 3; + ip->i_forkoff = roundup(sizeof(xfs_dev_t), 8) >> 3; break; case XFS_DINODE_FMT_LOCAL: case XFS_DINODE_FMT_EXTENTS: case XFS_DINODE_FMT_BTREE: - ip->i_d.di_forkoff = xfs_attr_shortform_bytesfit(ip, size); - if (!ip->i_d.di_forkoff) - ip->i_d.di_forkoff = xfs_default_attroffset(ip) >> 3; + ip->i_forkoff = xfs_attr_shortform_bytesfit(ip, size); + if (!ip->i_forkoff) + ip->i_forkoff = xfs_default_attroffset(ip) >> 3; else if ((ip->i_mount->m_flags & XFS_MOUNT_ATTR2) && version) *version = 2; break; diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c index 8c4b7bd69285fa..69a6844b1698d0 100644 --- a/fs/xfs/libxfs/xfs_inode_buf.c +++ b/fs/xfs/libxfs/xfs_inode_buf.c @@ -245,7 +245,7 @@ xfs_inode_from_disk( ip->i_disk_size = be64_to_cpu(from->di_size); ip->i_nblocks = be64_to_cpu(from->di_nblocks); ip->i_extsize = be32_to_cpu(from->di_extsize); - to->di_forkoff = from->di_forkoff; + ip->i_forkoff = from->di_forkoff; to->di_dmevmask = be32_to_cpu(from->di_dmevmask); to->di_dmstate = be16_to_cpu(from->di_dmstate); to->di_flags = be16_to_cpu(from->di_flags); @@ -310,7 +310,7 @@ xfs_inode_to_disk( to->di_extsize = cpu_to_be32(ip->i_extsize); to->di_nextents = cpu_to_be32(xfs_ifork_nextents(&ip->i_df)); to->di_anextents = cpu_to_be16(xfs_ifork_nextents(ip->i_afp)); - to->di_forkoff = from->di_forkoff; + to->di_forkoff = ip->i_forkoff; to->di_aformat = xfs_ifork_format(ip->i_afp); to->di_dmevmask = cpu_to_be32(from->di_dmevmask); to->di_dmstate = cpu_to_be16(from->di_dmstate); diff --git a/fs/xfs/libxfs/xfs_inode_buf.h b/fs/xfs/libxfs/xfs_inode_buf.h index 8cc96f2766ff4f..032486dbf82757 100644 --- a/fs/xfs/libxfs/xfs_inode_buf.h +++ b/fs/xfs/libxfs/xfs_inode_buf.h @@ -16,7 +16,6 @@ struct xfs_dinode; * format specific structures at the appropriate time. */ struct xfs_icdinode { - uint8_t di_forkoff; /* attr fork offs, <<3 for 64b align */ uint32_t di_dmevmask; /* DMIG event mask */ uint16_t di_dmstate; /* DMIG state info */ uint16_t di_flags; /* random flags, XFS_DIFLAG_... */ diff --git a/fs/xfs/libxfs/xfs_inode_fork.h b/fs/xfs/libxfs/xfs_inode_fork.h index a4953e95c4f3f6..7d6982b23446c2 100644 --- a/fs/xfs/libxfs/xfs_inode_fork.h +++ b/fs/xfs/libxfs/xfs_inode_fork.h @@ -38,8 +38,8 @@ struct xfs_ifork { * Fork handling. */ -#define XFS_IFORK_Q(ip) ((ip)->i_d.di_forkoff != 0) -#define XFS_IFORK_BOFF(ip) ((int)((ip)->i_d.di_forkoff << 3)) +#define XFS_IFORK_Q(ip) ((ip)->i_forkoff != 0) +#define XFS_IFORK_BOFF(ip) ((int)((ip)->i_forkoff << 3)) #define XFS_IFORK_PTR(ip,w) \ ((w) == XFS_DATA_FORK ? \ diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c index e6b40f7035aa5a..ccd437432aa963 100644 --- a/fs/xfs/xfs_icache.c +++ b/fs/xfs/xfs_icache.c @@ -67,7 +67,7 @@ xfs_inode_alloc( ip->i_flags = 0; ip->i_delayed_blks = 0; ip->i_nblocks = 0; - ip->i_d.di_forkoff = 0; + ip->i_forkoff = 0; ip->i_sick = 0; ip->i_checked = 0; INIT_WORK(&ip->i_ioend_work, xfs_end_io); diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index fd111e05c0bb2e..764f91610d1496 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -1858,7 +1858,7 @@ xfs_inactive( } ASSERT(!ip->i_afp); - ASSERT(ip->i_d.di_forkoff == 0); + ASSERT(ip->i_forkoff == 0); /* * Free the inode. @@ -2758,7 +2758,7 @@ xfs_ifree( ip->i_d.di_flags = 0; ip->i_d.di_flags2 = 0; ip->i_d.di_dmevmask = 0; - ip->i_d.di_forkoff = 0; /* mark the attr fork not in use */ + ip->i_forkoff = 0; /* mark the attr fork not in use */ ip->i_df.if_format = XFS_DINODE_FMT_EXTENTS; /* Don't attempt to replay owner changes for a deleted inode */ @@ -3756,11 +3756,11 @@ xfs_iflush_int( ip->i_nblocks, ip); goto flush_out; } - if (XFS_TEST_ERROR(ip->i_d.di_forkoff > mp->m_sb.sb_inodesize, + if (XFS_TEST_ERROR(ip->i_forkoff > mp->m_sb.sb_inodesize, mp, XFS_ERRTAG_IFLUSH_6)) { xfs_alert_tag(mp, XFS_PTAG_IFLUSH, "%s: bad inode %Lu, forkoff 0x%x, ptr "PTR_FMT, - __func__, ip->i_ino, ip->i_d.di_forkoff, ip); + __func__, ip->i_ino, ip->i_forkoff, ip); goto flush_out; } diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h index a0444b9ce3f792..31440ab88cf141 100644 --- a/fs/xfs/xfs_inode.h +++ b/fs/xfs/xfs_inode.h @@ -63,6 +63,7 @@ typedef struct xfs_inode { xfs_extlen_t i_cowextsize; /* basic cow extent size */ uint16_t i_flushiter; /* incremented on flush */ }; + uint8_t i_forkoff; /* attr fork offset >> 3 */ struct xfs_icdinode i_d; /* most of ondisk inode */ diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c index 8357fe37d3eb8a..a83ddc4e029f0f 100644 --- a/fs/xfs/xfs_inode_item.c +++ b/fs/xfs/xfs_inode_item.c @@ -328,7 +328,7 @@ xfs_inode_to_log_dinode( to->di_extsize = ip->i_extsize; to->di_nextents = xfs_ifork_nextents(&ip->i_df); to->di_anextents = xfs_ifork_nextents(ip->i_afp); - to->di_forkoff = from->di_forkoff; + to->di_forkoff = ip->i_forkoff; to->di_aformat = xfs_ifork_format(ip->i_afp); to->di_dmevmask = from->di_dmevmask; to->di_dmstate = from->di_dmstate;
In preparation of removing the historic icinode struct, move the forkoff field into the containing xfs_inode structure. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/xfs/libxfs/xfs_attr_leaf.c | 22 +++++++++++----------- fs/xfs/libxfs/xfs_bmap.c | 32 ++++++++++++++++---------------- fs/xfs/libxfs/xfs_inode_buf.c | 4 ++-- fs/xfs/libxfs/xfs_inode_buf.h | 1 - fs/xfs/libxfs/xfs_inode_fork.h | 4 ++-- fs/xfs/xfs_icache.c | 2 +- fs/xfs/xfs_inode.c | 8 ++++---- fs/xfs/xfs_inode.h | 1 + fs/xfs/xfs_inode_item.c | 2 +- 9 files changed, 38 insertions(+), 38 deletions(-)