move the extent count and format into struct xfs_ifork v2
Hi all,
this series moves the extent count and format fields into the xfs_ifork structure. It is based on the "dinode reading cleanups v2" series.
Git tree:
git://git.infradead.org/users/hch/xfs.git xfs-ifork-cleanup.2
Gitweb:
http://git.infradead.org/users/hch/xfs.git/shortlog/refs/heads/xfs-ifork-cleanup.2
Changes since v1:
- pick up a different scrub prep patch from Darrick
- keep the nextents == 0 assert in xfs_attr_fork_remove
- keep clearing various ifork fields in xfs_ifork_destroy
- add more comments
PATCH 1/6 xfs: clean up xchk_bmap_check_rmaps usage of XFS_IFORK_Q
From: "Darrick J. Wong" <[email protected]>
XFS_IFORK_Q is supposed to be a predicate, not a function returning a value. Its usage is in xchk_bmap_check_rmaps is incorrect, but that function only cares about whether or not the "size" of the data is zero or not. Convert that logic to use a proper boolean, and teach the caller to skip the call entirely if the end result would be that we'd do nothing anyway. This avoids a crash later in this series.
--- fs/xfs/scrub/bmap.c | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-)
fs/xfs/scrub/bmap.c +13 -22
@@ -566,8 +566,8 @@ xchk_bmap_check_rmaps( struct xfs_scrub *sc, int whichfork) { -loff_t size;xfs_agnumber_t agno; +bool zero_size;int error; if (!xfs_sb_version_hasrmapbt(&sc->mp->m_sb) ||
@@ -579,6 +579,8 @@ xchk_bmap_check_rmaps(if (XFS_IS_REALTIME_INODE (sc->ip) && whichfork ==XFS_DATA_FORK )return 0 ; +ASSERT (XFS_IFORK_PTR (sc->ip, whichfork) !=NULL ); +/* * Only do this for complex maps that are in btree format, or for * situations where we would seem to have a size but zero extents.
@@ -586,19 +588,13 @@ xchk_bmap_check_rmaps(* to flag this bmap as corrupt if there are rmaps that need to be * reattached. */ -switch (whichfork) { -case XFS_DATA_FORK : - size =i_size_read (VFS_I (sc->ip)); -break ; -case XFS_ATTR_FORK : - size =XFS_IFORK_Q (sc->ip); -break ; -default : - size =0 ; -break ; - } +if (whichfork ==XFS_DATA_FORK ) + zero_size =i_size_read (VFS_I (sc->ip)) ==0 ; +else + zero_size = false; +if (XFS_IFORK_FORMAT (sc->ip, whichfork) !=XFS_DINODE_FMT_BTREE && - (size ==0 ||XFS_IFORK_NEXTENTS (sc->ip, whichfork) >0 )) + (zero_size ||XFS_IFORK_NEXTENTS (sc->ip, whichfork) >0 ))return 0 ;for (agno =0 ; agno < sc->mp->m_sb.sb_agcount; agno++) {
@@ -627,12 +623,14 @@ xchk_bmap(struct xchk_bmap_info info = {NULL };struct xfs_mount *mp = sc->mp;struct xfs_inode *ip = sc->ip; -struct xfs_ifork *ifp; +struct xfs_ifork *ifp =XFS_IFORK_PTR (ip, whichfork);xfs_fileoff_t endoff;struct xfs_iext_cursor icur;int error =0 ; - ifp =XFS_IFORK_PTR (ip, whichfork); +/* Non-existent forks can be ignored. */ +if (!ifp) + goto out; info.is_rt = whichfork ==XFS_DATA_FORK &&XFS_IS_REALTIME_INODE (ip); info.whichfork = whichfork;
@@ -641,9 +639,6 @@ xchk_bmap(switch (whichfork) {case XFS_COW_FORK : -/* Non-existent CoW forks are ignorable. */ -if (!ifp) - goto out;/* No CoW forks on non-reflink inodes/filesystems. */ if (!xfs_is_reflink_inode (ip)) {xchk_ino_set_corrupt (sc, sc->ip->i_ino);
@@ -651,8 +646,6 @@ xchk_bmap( }break ;case XFS_ATTR_FORK : -if (!ifp) - goto out_check_rmap;if (!xfs_sb_version_hasattr (&mp->m_sb) && !xfs_sb_version_hasattr2 (&mp->m_sb))xchk_ino_set_corrupt (sc, sc->ip->i_ino);
@@ -700,7 +693,6 @@ xchk_bmap(/* Scrub extent records. */ info.lastoff =0 ; - ifp =XFS_IFORK_PTR (ip, whichfork);for_each_xfs_iext (ifp, &icur, &irec) {if (xchk_should_terminate (sc, &error) || (sc->sm->sm_flags &XFS_SCRUB_OFLAG_CORRUPT ))
@@ -717,7 +709,6 @@ xchk_bmap( goto out; } -out_check_rmap: error =xchk_bmap_check_rmaps (sc, whichfork);if (!xchk_fblock_xref_process_error (sc, whichfork,0 , &error)) goto out;
Signature · 1 line
2.26.2
Re: [PATCH 1/6] xfs: clean up xchk_bmap_check_rmaps usage of XFS_IFORK_Q
Quoted 9 lines · Christoph Hellwig
From: "Darrick J. Wong" <[email protected]>
XFS_IFORK_Qis supposed to be a predicate, not a function returning a value. Its usage is inxchk_bmap_check_rmapsis incorrect, but that function only cares about whether or not the "size" of the data is zero or not. Convert that logic to use a proper boolean, and teach the caller to skip the call entirely if the end result would be that we'd do nothing anyway. This avoids a crash later in this series.
Quoted 4 lines
Signed-off-by Darrick J. Wong <[email protected]>[hch: generalized the NULL ifor check]Signed-off-by Christoph Hellwig <[email protected]>---
I'm still rather confused about the i_size logic, but this seems like a good cleanup regardless:
Quoted 107 lines
fs/xfs/scrub/bmap.c | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-)fs/xfs/scrub/bmap.c +13
-22@@ -566,8 +566,8 @@ xchk_bmap_check_rmaps( struct xfs_scrub *sc, int whichfork) { -loff_t size;xfs_agnumber_t agno; +bool zero_size;int error; if (!xfs_sb_version_hasrmapbt(&sc->mp->m_sb) ||@@ -579,6 +579,8 @@ xchk_bmap_check_rmaps(if (XFS_IS_REALTIME_INODE (sc->ip) && whichfork ==XFS_DATA_FORK )return 0 ; +ASSERT (XFS_IFORK_PTR (sc->ip, whichfork) !=NULL ); +/* * Only do this for complex maps that are in btree format, or for * situations where we would seem to have a size but zero extents. @@ -586,19 +588,13 @@ xchk_bmap_check_rmaps(* to flag this bmap as corrupt if there are rmaps that need to be * reattached. */ -switch (whichfork) { -case XFS_DATA_FORK : - size =i_size_read (VFS_I (sc->ip)); -break ; -case XFS_ATTR_FORK : - size =XFS_IFORK_Q (sc->ip); -break ; -default : - size =0 ; -break ; - } +if (whichfork ==XFS_DATA_FORK ) + zero_size =i_size_read (VFS_I (sc->ip)) ==0 ; +else + zero_size = false; +if (XFS_IFORK_FORMAT (sc->ip, whichfork) !=XFS_DINODE_FMT_BTREE && - (size ==0 ||XFS_IFORK_NEXTENTS (sc->ip, whichfork) >0 )) + (zero_size ||XFS_IFORK_NEXTENTS (sc->ip, whichfork) >0 ))return 0 ;for (agno =0 ; agno < sc->mp->m_sb.sb_agcount; agno++) {@@ -627,12 +623,14 @@ xchk_bmap(struct xchk_bmap_info info = {NULL };struct xfs_mount *mp = sc->mp;struct xfs_inode *ip = sc->ip; -struct xfs_ifork *ifp; +struct xfs_ifork *ifp =XFS_IFORK_PTR (ip, whichfork);xfs_fileoff_t endoff;struct xfs_iext_cursor icur;int error =0 ; - ifp =XFS_IFORK_PTR (ip, whichfork); +/* Non-existent forks can be ignored. */ +if (!ifp) + goto out; info.is_rt = whichfork ==XFS_DATA_FORK &&XFS_IS_REALTIME_INODE (ip); info.whichfork = whichfork;@@ -641,9 +639,6 @@ xchk_bmap(switch (whichfork) {case XFS_COW_FORK : -/* Non-existent CoW forks are ignorable. */ -if (!ifp) - goto out;/* No CoW forks on non-reflink inodes/filesystems. */ if (!xfs_is_reflink_inode (ip)) {xchk_ino_set_corrupt (sc, sc->ip->i_ino);@@ -651,8 +646,6 @@ xchk_bmap( }break ;case XFS_ATTR_FORK : -if (!ifp) - goto out_check_rmap;if (!xfs_sb_version_hasattr (&mp->m_sb) && !xfs_sb_version_hasattr2 (&mp->m_sb))xchk_ino_set_corrupt (sc, sc->ip->i_ino);@@ -700,7 +693,6 @@ xchk_bmap(/* Scrub extent records. */ info.lastoff =0 ; - ifp =XFS_IFORK_PTR (ip, whichfork);for_each_xfs_iext (ifp, &icur, &irec) {if (xchk_should_terminate (sc, &error) || (sc->sm->sm_flags &XFS_SCRUB_OFLAG_CORRUPT ))@@ -717,7 +709,6 @@ xchk_bmap( goto out; } -out_check_rmap: error =xchk_bmap_check_rmaps (sc, whichfork);if (!xchk_fblock_xref_process_error (sc, whichfork,0 , &error)) goto out;Signature · 1 line
2.26.2
PATCH 2/6 xfs: remove the XFS_DFORK_Q macro
In reply to Christoph HellwigJust checking di_forkoff directly is a little easier to follow.
--- fs/xfs/libxfs/xfs_format.h | 5 ++--- fs/xfs/libxfs/xfs_inode_buf.c | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-)
fs/xfs/libxfs/xfs_format.h +2 -3
@@ -964,13 +964,12 @@ enum xfs_dinode_fmt {/* * Inode data & attribute fork sizes, per inode. */ -#define XFS_DFORK_Q (dip) ((dip)->di_forkoff != 0)#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_forkoff ? XFS_DFORK_BOFF(dip) : XFS_LITINO(mp))#define XFS_DFORK_ASIZE (dip,mp) \ - (XFS_DFORK_Q(dip) ? XFS_LITINO(mp) - XFS_DFORK_BOFF(dip) : 0) + ((dip)->di_forkoff ? XFS_LITINO(mp) - XFS_DFORK_BOFF(dip) : 0)#define XFS_DFORK_SIZE (dip,mp,w) \ ((w) == XFS_DATA_FORK ? \ XFS_DFORK_DSIZE(dip, mp) : \
fs/xfs/libxfs/xfs_inode_buf.c +3 -3
@@ -265,7 +265,7 @@ xfs_inode_from_disk( error =xfs_iformat_data_fork (ip, from);if (error)return error; -if (XFS_DFORK_Q (from)) { +if (from->di_forkoff) { error =xfs_iformat_attr_fork (ip, from);if (error) goto out_destroy_data_fork;
@@ -435,7 +435,7 @@ xfs_dinode_verify_forkoff( struct xfs_dinode *dip, struct xfs_mount *mp) { -if (!XFS_DFORK_Q (dip)) +if (!dip->di_forkoff)return NULL ;switch (dip->di_format) {
@@ -538,7 +538,7 @@ xfs_dinode_verify(return __this_address; } -if (XFS_DFORK_Q (dip)) { +if (dip->di_forkoff) { fa =xfs_dinode_verify_fork (dip, mp,XFS_ATTR_FORK );if (fa)return fa;
Signature · 1 line
2.26.2
PATCH 3/6 xfs: remove xfs_ifree_local_data
In reply to Christoph Hellwigxfs_ifree only need to free inline data in the data fork, as we've already taken care of the attr fork before (and in fact freed the fork structure). Just open code the freeing of the inline data.
--- fs/xfs/xfs_inode.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-)
fs/xfs/xfs_inode.c +10 -20
@@ -2711,24 +2711,6 @@ xfs_ifree_cluster(return 0 ; } -/* -* Free any local-format buffers sitting around before we reset to -* extents format. -*/ -static inline void -xfs_ifree_local_data ( -struct xfs_inode *ip, -int whichfork) -{ -struct xfs_ifork *ifp; - -if (XFS_IFORK_FORMAT (ip, whichfork) !=XFS_DINODE_FMT_LOCAL ) -return ; - - ifp =XFS_IFORK_PTR (ip, whichfork); -xfs_idata_realloc (ip, -ifp->if_bytes, whichfork); -} -/* * This is called to return an inode to the inode free list. * The inode should already be truncated to 0 length and have
@@ -2765,8 +2747,16 @@ xfs_ifree(if (error)return error; -xfs_ifree_local_data (ip,XFS_DATA_FORK ); -xfs_ifree_local_data (ip,XFS_ATTR_FORK ); +/* +* Free any local-format data sitting around before we reset the +* data fork to extents format. Note that the attr fork data has +* already been freed by xfs_attr_inactive. +*/ +if (ip->i_d.di_format ==XFS_DINODE_FMT_LOCAL ) { +kmem_free (ip->i_df.if_u1.if_data); + ip->i_df.if_u1.if_data =NULL ; + ip->i_df.if_bytes =0 ; + }VFS_I (ip)->i_mode =0 ;/* mark incore inode as free */ ip->i_d.di_flags =0 ;
Signature · 1 line
2.26.2
PATCH 4/6 xfs: move the per-fork nextents fields into struct xfs_ifork
In reply to Christoph HellwigThere are there are three extents counters per inode, one for each of the forks. Two are in the legacy icdinode and one is directly in struct xfs_inode. Switch to a single counter in the xfs_ifork structure where it uses up padding at the end of the structure. This simplifies various bits of code that just wants the number of extents counter and can now directly dereference it.
--- fs/xfs/libxfs/xfs_attr.c | 4 +- fs/xfs/libxfs/xfs_attr_leaf.c | 3 +- fs/xfs/libxfs/xfs_bmap.c | 126 ++++++++++++++------------------- fs/xfs/libxfs/xfs_dir2_block.c | 2 +- fs/xfs/libxfs/xfs_inode_buf.c | 6 +- fs/xfs/libxfs/xfs_inode_buf.h | 2 - fs/xfs/libxfs/xfs_inode_fork.c | 20 ++++-- fs/xfs/libxfs/xfs_inode_fork.h | 20 +++--- fs/xfs/scrub/bmap.c | 3 +- fs/xfs/scrub/parent.c | 2 +- fs/xfs/xfs_bmap_util.c | 28 ++++---- fs/xfs/xfs_file.c | 2 +- fs/xfs/xfs_icache.c | 1 - fs/xfs/xfs_inode.c | 19 +++-- fs/xfs/xfs_inode.h | 1 - fs/xfs/xfs_inode_item.c | 14 ++-- fs/xfs/xfs_ioctl.c | 25 +++---- fs/xfs/xfs_iomap.c | 2 +- fs/xfs/xfs_iops.c | 2 +- fs/xfs/xfs_itable.c | 4 +- fs/xfs/xfs_qm_syscalls.c | 2 +- fs/xfs/xfs_quotaops.c | 2 +- fs/xfs/xfs_symlink.c | 2 +- fs/xfs/xfs_trace.h | 2 +- 24 files changed, 132 insertions(+), 162 deletions(-)
fs/xfs/libxfs/xfs_attr.c +2 -2
@@ -62,7 +62,7 @@ xfs_inode_hasattr( {if (!XFS_IFORK_Q (ip) || (ip->i_d.di_aformat ==XFS_DINODE_FMT_EXTENTS && - ip->i_d.di_anextents ==0 )) + ip->i_afp->if_nextents ==0 ))return 0 ;return 1 ; }
@@ -214,7 +214,7 @@ xfs_attr_set_args(*/ if (dp->i_d.di_aformat ==XFS_DINODE_FMT_LOCAL || (dp->i_d.di_aformat ==XFS_DINODE_FMT_EXTENTS && - dp->i_d.di_anextents ==0 )) { + dp->i_afp->if_nextents ==0 )) {/* * Build initial attribute list (if required).
fs/xfs/libxfs/xfs_attr_leaf.c +2 -1
@@ -719,11 +719,12 @@ xfs_attr_fork_remove(struct xfs_inode *ip, struct xfs_trans *tp) { + ASSERT(ip->i_afp->if_nextents == 0); +xfs_idestroy_fork (ip,XFS_ATTR_FORK ); ip->i_d.di_forkoff =0 ; ip->i_d.di_aformat =XFS_DINODE_FMT_EXTENTS ; -ASSERT (ip->i_d.di_anextents ==0 );ASSERT (ip->i_afp ==NULL );xfs_trans_log_inode (tp, ip,XFS_ILOG_CORE );
fs/xfs/libxfs/xfs_bmap.c +55 -71
372 lines not on this page · raw message
fs/xfs/libxfs/xfs_dir2_block.c +1 -1
@@ -1104,7 +1104,7 @@ xfs_dir2_sf_to_block(ASSERT (ifp->if_bytes == dp->i_d.di_size);ASSERT (ifp->if_u1.if_data !=NULL );ASSERT (dp->i_d.di_size >=xfs_dir2_sf_hdr_size (oldsfp->i8count)); -ASSERT (dp->i_d.di_nextents ==0 ); +ASSERT (dp->i_df.if_nextents ==0 );/* * Copy the directory into a temporary buffer.
fs/xfs/libxfs/xfs_inode_buf.c +2 -4
@@ -245,8 +245,6 @@ xfs_inode_from_disk( to->di_size =be64_to_cpu (from->di_size); to->di_nblocks =be64_to_cpu (from->di_nblocks); to->di_extsize =be32_to_cpu (from->di_extsize); - to->di_nextents =be32_to_cpu (from->di_nextents); - to->di_anextents =be16_to_cpu (from->di_anextents); to->di_forkoff = from->di_forkoff; to->di_aformat = from->di_aformat; to->di_dmevmask =be32_to_cpu (from->di_dmevmask);
@@ -311,8 +309,8 @@ xfs_inode_to_disk( to->di_size =cpu_to_be64 (from->di_size); to->di_nblocks =cpu_to_be64 (from->di_nblocks); to->di_extsize =cpu_to_be32 (from->di_extsize); - to->di_nextents =cpu_to_be32 (from->di_nextents); - to->di_anextents =cpu_to_be16 (from->di_anextents); + 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_aformat = from->di_aformat; to->di_dmevmask =cpu_to_be32 (from->di_dmevmask);
fs/xfs/libxfs/xfs_inode_buf.h +0 -2
@@ -22,8 +22,6 @@ struct xfs_icdinode {xfs_fsize_t di_size;/* number of bytes in file */ xfs_rfsblock_t di_nblocks;/* # of direct & btree blocks used */ xfs_extlen_t di_extsize;/* basic/minimum extent size for file */ -xfs_extnum_t di_nextents;/* number of extents in data fork */ -xfs_aextnum_t di_anextents;/* number of extents in attribute fork*/ uint8_t di_forkoff;/* attr fork offs, <<3 for 64b align */ int8_t di_aformat;/* format of attr fork's data */ uint32_t di_dmevmask;/* DMIG event mask */
fs/xfs/libxfs/xfs_inode_fork.c +15 -5
@@ -188,12 +188,11 @@ xfs_iformat_btree(* or the number of extents is greater than the number of * blocks. */ -if (unlikely (XFS_IFORK_NEXTENTS (ip, whichfork) <= -XFS_IFORK_MAXEXT (ip, whichfork) || +if (unlikely (ifp->if_nextents <=XFS_IFORK_MAXEXT (ip, whichfork) || nrecs ==0 ||XFS_BMDR_SPACE_CALC (nrecs) >XFS_DFORK_SIZE (dip, mp, whichfork) || -XFS_IFORK_NEXTENTS (ip, whichfork) > ip->i_d.di_nblocks) || + ifp->if_nextents > ip->i_d.di_nblocks) || level ==0 || level >XFS_BTREE_MAXLEVELS ) {xfs_warn (mp,"corrupt inode %Lu (btree)." , (unsigned long long ) ip->i_ino);
@@ -229,6 +228,12 @@ xfs_iformat_data_fork(struct inode *inode =VFS_I (ip);int error; +/* +* Initialize the extent count early, as the per-format routines may +* depend on it. +*/ + ip->i_df.if_nextents =be32_to_cpu (dip->di_nextents); +switch (inode->i_mode &S_IFMT ) {case S_IFIFO :case S_IFCHR :
@@ -281,7 +286,13 @@ xfs_iformat_attr_fork( {int error =0 ; +/* +* Initialize the extent count early, as the per-format routines may +* depend on it. +*/ ip->i_afp =kmem_zone_zalloc (xfs_ifork_zone,KM_NOFS ); + ip->i_afp->if_nextents =be16_to_cpu (dip->di_anextents); +switch (dip->di_aformat) {case XFS_DINODE_FMT_LOCAL : error = xfs_iformat_local(ip, dip, XFS_ATTR_FORK,
@@ -617,7 +628,7 @@ xfs_iflush_fork( !(iip->ili_fields & extflag[whichfork]));if ((iip->ili_fields & extflag[whichfork]) && (ifp->if_bytes >0 )) { -ASSERT (XFS_IFORK_NEXTENTS (ip, whichfork) >0 ); +ASSERT (ifp->if_nextents >0 ); (void )xfs_iextents_copy (ip, (xfs_bmbt_rec_t *)cp, whichfork); }
@@ -676,7 +687,6 @@ xfs_ifork_init_cow( KM_NOFS); ip->i_cowfp->if_flags =XFS_IFEXTENTS ; ip->i_cformat =XFS_DINODE_FMT_EXTENTS ; - ip->i_cnextents =0 ; }/* Verify the inline contents of the data fork of an inode. */
fs/xfs/libxfs/xfs_inode_fork.h +8 -12
@@ -23,6 +23,7 @@ struct xfs_ifork { } if_u1;short if_broot_bytes;/* bytes allocated for root */ unsigned char if_flags;/* per-fork flags */ +xfs_extnum_t if_nextents;/* # of extents in this fork */ };/*
@@ -67,18 +68,6 @@ struct xfs_ifork { ((w) == XFS_ATTR_FORK ? \ ((ip)->i_d.di_aformat = (n)) : \ ((ip)->i_cformat = (n)))) -#define XFS_IFORK_NEXTENTS (ip,w) \ - ((w) == XFS_DATA_FORK ? \ - (ip)->i_d.di_nextents : \ - ((w) == XFS_ATTR_FORK ? \ - (ip)->i_d.di_anextents : \ - (ip)->i_cnextents)) -#define XFS_IFORK_NEXT_SET (ip,w,n) \ - ((w) == XFS_DATA_FORK ? \ - ((ip)->i_d.di_nextents = (n)) : \ - ((w) == XFS_ATTR_FORK ? \ - ((ip)->i_d.di_anextents = (n)) : \ - ((ip)->i_cnextents = (n))))#define XFS_IFORK_MAXEXT (ip, w) \ (XFS_IFORK_SIZE(ip, w) / sizeof(xfs_bmbt_rec_t))
@@ -86,6 +75,13 @@ struct xfs_ifork { (XFS_IFORK_FORMAT ((ip), (w)) ==XFS_DINODE_FMT_EXTENTS || \ XFS_IFORK_FORMAT((ip), (w)) == XFS_DINODE_FMT_BTREE) +static inline xfs_extnum_t xfs_ifork_nextents (struct xfs_ifork *ifp) +{ +if (!ifp) +return 0 ; +return ifp->if_nextents; +} +struct xfs_ifork *xfs_iext_state_to_fork (struct xfs_inode *ip,int state);int xfs_iformat_data_fork (struct xfs_inode *,struct xfs_dinode *);
fs/xfs/scrub/bmap.c +2 -1
@@ -566,6 +566,7 @@ xchk_bmap_check_rmaps( struct xfs_scrub *sc, int whichfork) { +struct xfs_ifork *ifp =XFS_IFORK_PTR (sc->ip, whichfork);xfs_agnumber_t agno;bool zero_size;int error;
@@ -594,7 +595,7 @@ xchk_bmap_check_rmaps( zero_size = false;if (XFS_IFORK_FORMAT (sc->ip, whichfork) !=XFS_DINODE_FMT_BTREE && - (zero_size ||XFS_IFORK_NEXTENTS (sc->ip, whichfork) >0 )) + (zero_size || ifp->if_nextents >0 ))return 0 ;for (agno =0 ; agno < sc->mp->m_sb.sb_agcount; agno++) {
fs/xfs/scrub/parent.c +1 -1
@@ -90,7 +90,7 @@ xchk_parent_count_parent_dentries(* if there is one. */ lock_mode =xfs_ilock_data_map_shared (parent); -if (parent->i_d.di_nextents >0 ) +if (parent->i_df.if_nextents >0 ) error =xfs_dir3_data_readahead (parent,0 ,0 );xfs_iunlock (parent, lock_mode);if (error)
fs/xfs/xfs_bmap_util.c +12 -16
@@ -1220,7 +1220,7 @@ xfs_swap_extents_check_format(* if the target inode has less extents that then temporary inode then * why did userspace call us? */ -if (ip->i_d.di_nextents < tip->i_d.di_nextents) +if (ip->i_df.if_nextents < tip->i_df.if_nextents)return -EINVAL ;/*
@@ -1241,14 +1241,12 @@ xfs_swap_extents_check_format(/* Check temp in extent form to max in target */ if (tip->i_d.di_format ==XFS_DINODE_FMT_EXTENTS && -XFS_IFORK_NEXTENTS (tip,XFS_DATA_FORK ) > -XFS_IFORK_MAXEXT (ip,XFS_DATA_FORK )) + tip->i_df.if_nextents >XFS_IFORK_MAXEXT (ip,XFS_DATA_FORK ))return -EINVAL ;/* Check target in extent form to max in temp */ if (ip->i_d.di_format ==XFS_DINODE_FMT_EXTENTS && -XFS_IFORK_NEXTENTS (ip,XFS_DATA_FORK ) > -XFS_IFORK_MAXEXT (tip,XFS_DATA_FORK )) + ip->i_df.if_nextents >XFS_IFORK_MAXEXT (tip,XFS_DATA_FORK ))return -EINVAL ;/*
@@ -1264,7 +1262,7 @@ xfs_swap_extents_check_format(if (XFS_IFORK_Q (ip) &&XFS_BMAP_BMDR_SPACE (tip->i_df.if_broot) >XFS_IFORK_BOFF (ip))return -EINVAL ; -if (XFS_IFORK_NEXTENTS (tip,XFS_DATA_FORK ) <= +if (tip->i_df.if_nextents <=XFS_IFORK_MAXEXT (ip,XFS_DATA_FORK ))return -EINVAL ; }
@@ -1274,7 +1272,7 @@ xfs_swap_extents_check_format(if (XFS_IFORK_Q (tip) &&XFS_BMAP_BMDR_SPACE (ip->i_df.if_broot) >XFS_IFORK_BOFF (tip))return -EINVAL ; -if (XFS_IFORK_NEXTENTS (ip,XFS_DATA_FORK ) <= +if (ip->i_df.if_nextents <=XFS_IFORK_MAXEXT (tip,XFS_DATA_FORK ))return -EINVAL ; }
@@ -1427,15 +1425,15 @@ xfs_swap_extent_forks(/* * Count the number of extended attribute blocks */ -if ( ((XFS_IFORK_Q (ip) !=0 ) && (ip->i_d.di_anextents >0 )) && - (ip->i_d.di_aformat !=XFS_DINODE_FMT_LOCAL )) { +if (XFS_IFORK_Q (ip) && ip->i_afp->if_nextents >0 && + ip->i_d.di_aformat !=XFS_DINODE_FMT_LOCAL ) { error =xfs_bmap_count_blocks (tp, ip,XFS_ATTR_FORK , &junk, &aforkblks);if (error)return error; } -if ( ((XFS_IFORK_Q (tip) !=0 ) && (tip->i_d.di_anextents >0 )) && - (tip->i_d.di_aformat !=XFS_DINODE_FMT_LOCAL )) { +if (XFS_IFORK_Q (tip) && tip->i_afp->if_nextents >0 && + tip->i_d.di_aformat !=XFS_DINODE_FMT_LOCAL ) { error =xfs_bmap_count_blocks (tp, tip,XFS_ATTR_FORK , &junk, &taforkblks);if (error)
@@ -1468,7 +1466,6 @@ xfs_swap_extent_forks( ip->i_d.di_nblocks = tip->i_d.di_nblocks - taforkblks + aforkblks; tip->i_d.di_nblocks = tmp + taforkblks - aforkblks; -swap (ip->i_d.di_nextents, tip->i_d.di_nextents);swap (ip->i_d.di_format, tip->i_d.di_format);/*
@@ -1615,9 +1612,9 @@ xfs_swap_extents(* performed with log redo items! */ if (xfs_sb_version_hasrmapbt (&mp->m_sb)) { -int w =XFS_DATA_FORK ; -uint32_t ipnext =XFS_IFORK_NEXTENTS (ip, w); -uint32_t tipnext =XFS_IFORK_NEXTENTS (tip, w); +int w =XFS_DATA_FORK ; +uint32_t ipnext = ip->i_df.if_nextents; +uint32_t tipnext = tip->i_df.if_nextents;/* * Conceptually this shouldn't affect the shape of either bmbt,
@@ -1720,7 +1717,6 @@ xfs_swap_extents(ASSERT (ip->i_cformat ==XFS_DINODE_FMT_EXTENTS );ASSERT (tip->i_cformat ==XFS_DINODE_FMT_EXTENTS ); -swap (ip->i_cnextents, tip->i_cnextents);swap (ip->i_cowfp, tip->i_cowfp);if (ip->i_cowfp && ip->i_cowfp->if_bytes)
fs/xfs/xfs_file.c +1 -1
@@ -1102,7 +1102,7 @@ xfs_dir_open(* certain to have the next operation be a read there. */ mode =xfs_ilock_data_map_shared (ip); -if (ip->i_d.di_nextents >0 ) +if (ip->i_df.if_nextents >0 ) error =xfs_dir3_data_readahead (ip,0 ,0 );xfs_iunlock (ip, mode);return error;
fs/xfs/xfs_icache.c +0 -1
@@ -63,7 +63,6 @@ xfs_inode_alloc(memset (&ip->i_imap,0 ,sizeof (struct xfs_imap )); ip->i_afp =NULL ; ip->i_cowfp =NULL ; - ip->i_cnextents =0 ; ip->i_cformat =XFS_DINODE_FMT_EXTENTS ;memset (&ip->i_df,0 ,sizeof (ip->i_df)); ip->i_flags =0 ;
fs/xfs/xfs_inode.c +8 -11
@@ -825,7 +825,7 @@ xfs_ialloc( inode->i_mode &= ~S_ISGID ; ip->i_d.di_size =0 ; - ip->i_d.di_nextents =0 ; + ip->i_df.if_nextents =0 ;ASSERT (ip->i_d.di_nblocks ==0 ); tv =current_time (inode);
@@ -919,7 +919,6 @@ xfs_ialloc(* Attribute fork settings for new inode. */ ip->i_d.di_aformat =XFS_DINODE_FMT_EXTENTS ; - ip->i_d.di_anextents =0 ;/* * Log the new values stuffed into the inode.
@@ -1686,7 +1685,7 @@ xfs_inactive_truncate(if (error) goto error_trans_cancel; -ASSERT (ip->i_d.di_nextents ==0 ); +ASSERT (ip->i_df.if_nextents ==0 ); error =xfs_trans_commit (tp);if (error)
@@ -1836,7 +1835,7 @@ xfs_inactive(if (S_ISREG (VFS_I (ip)->i_mode) && (ip->i_d.di_size !=0 ||XFS_ISIZE (ip) !=0 || - ip->i_d.di_nextents >0 || ip->i_delayed_blks >0 )) + ip->i_df.if_nextents >0 || ip->i_delayed_blks >0 )) truncate =1 ; error =xfs_qm_dqattach (ip);
@@ -1862,7 +1861,6 @@ xfs_inactive( }ASSERT (!ip->i_afp); -ASSERT (ip->i_d.di_anextents ==0 );ASSERT (ip->i_d.di_forkoff ==0 );/*
@@ -2731,8 +2729,7 @@ xfs_ifree(ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL ));ASSERT (VFS_I (ip)->i_nlink ==0 ); -ASSERT (ip->i_d.di_nextents ==0 ); -ASSERT (ip->i_d.di_anextents ==0 ); +ASSERT (ip->i_df.if_nextents ==0 );ASSERT (ip->i_d.di_size ==0 || !S_ISREG (VFS_I (ip)->i_mode));ASSERT (ip->i_d.di_nblocks ==0 );
@@ -3628,7 +3625,7 @@ xfs_iflush(ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL |XFS_ILOCK_SHARED ));ASSERT (xfs_isiflocked (ip));ASSERT (ip->i_d.di_format !=XFS_DINODE_FMT_BTREE || - ip->i_d.di_nextents >XFS_IFORK_MAXEXT (ip,XFS_DATA_FORK )); + ip->i_df.if_nextents >XFS_IFORK_MAXEXT (ip,XFS_DATA_FORK )); *bpp =NULL ;
@@ -3710,7 +3707,7 @@ xfs_iflush_int(ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL |XFS_ILOCK_SHARED ));ASSERT (xfs_isiflocked (ip));ASSERT (ip->i_d.di_format !=XFS_DINODE_FMT_BTREE || - ip->i_d.di_nextents >XFS_IFORK_MAXEXT (ip,XFS_DATA_FORK )); + ip->i_df.if_nextents >XFS_IFORK_MAXEXT (ip,XFS_DATA_FORK ));ASSERT (iip !=NULL && iip->ili_fields !=0 ); dip =xfs_buf_offset (bp, ip->i_imap.im_boffset);
@@ -3751,13 +3748,13 @@ xfs_iflush_int( goto flush_out; } } -if (XFS_TEST_ERROR (ip->i_d.di_nextents + ip->i_d.di_anextents > +if (XFS_TEST_ERROR (ip->i_df.if_nextents +xfs_ifork_nextents (ip->i_afp) > ip->i_d.di_nblocks, mp,XFS_ERRTAG_IFLUSH_5 )) {xfs_alert_tag (mp,XFS_PTAG_IFLUSH ,"%s: detected corrupt incore inode %Lu, " "total extents = %d, nblocks = %Ld, ptr " PTR_FMT , __func__, ip->i_ino, - ip->i_d.di_nextents + ip->i_d.di_anextents, + ip->i_df.if_nextents +xfs_ifork_nextents (ip->i_afp), ip->i_d.di_nblocks, ip); goto flush_out; }
fs/xfs/xfs_inode.h +0 -1
@@ -57,7 +57,6 @@ typedef struct xfs_inode {struct xfs_icdinode i_d;/* most of ondisk inode */ -xfs_extnum_t i_cnextents;/* # of extents in cow fork */ unsigned int i_cformat;/* format of cow fork */ /* VFS inode */
fs/xfs/xfs_inode_item.c +7 -7
@@ -39,7 +39,7 @@ xfs_inode_item_data_fork_size(switch (ip->i_d.di_format) {case XFS_DINODE_FMT_EXTENTS :if ((iip->ili_fields &XFS_ILOG_DEXT ) && - ip->i_d.di_nextents >0 && + ip->i_df.if_nextents >0 && ip->i_df.if_bytes >0 ) {/* worst case, doesn't subtract delalloc extents */ *nbytes +=XFS_IFORK_DSIZE (ip);
@@ -80,7 +80,7 @@ xfs_inode_item_attr_fork_size(switch (ip->i_d.di_aformat) {case XFS_DINODE_FMT_EXTENTS :if ((iip->ili_fields &XFS_ILOG_AEXT ) && - ip->i_d.di_anextents >0 && + ip->i_afp->if_nextents >0 && ip->i_afp->if_bytes >0 ) {/* worst case, doesn't subtract unused space */ *nbytes +=XFS_IFORK_ASIZE (ip);
@@ -148,7 +148,7 @@ xfs_inode_item_format_data_fork( ~(XFS_ILOG_DDATA |XFS_ILOG_DBROOT |XFS_ILOG_DEV );if ((iip->ili_fields &XFS_ILOG_DEXT ) && - ip->i_d.di_nextents >0 && + ip->i_df.if_nextents >0 && ip->i_df.if_bytes >0 ) {struct xfs_bmbt_rec *p;
@@ -233,12 +233,12 @@ xfs_inode_item_format_attr_fork( ~(XFS_ILOG_ADATA |XFS_ILOG_ABROOT );if ((iip->ili_fields &XFS_ILOG_AEXT ) && - ip->i_d.di_anextents >0 && + ip->i_afp->if_nextents >0 && ip->i_afp->if_bytes >0 ) {struct xfs_bmbt_rec *p;ASSERT (xfs_iext_count (ip->i_afp) == - ip->i_d.di_anextents); + ip->i_afp->if_nextents); p =xlog_prepare_iovec (lv, vecp,XLOG_REG_TYPE_IATTR_EXT ); data_bytes =xfs_iextents_copy (ip, p,XFS_ATTR_FORK );
@@ -326,8 +326,8 @@ xfs_inode_to_log_dinode( to->di_size = from->di_size; to->di_nblocks = from->di_nblocks; to->di_extsize = from->di_extsize; - to->di_nextents = from->di_nextents; - to->di_anextents = from->di_anextents; + 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_aformat = from->di_aformat; to->di_dmevmask = from->di_dmevmask;
fs/xfs/xfs_ioctl.c +8 -17
@@ -1104,26 +1104,17 @@ xfs_fill_fsxattr(bool attr, struct fsxattr *fa) { + struct xfs_ifork *ifp = attr ? ip->i_afp : &ip->i_df; +simple_fill_fsxattr (fa,xfs_ip2xflags (ip)); fa->fsx_extsize = ip->i_d.di_extsize << ip->i_mount->m_sb.sb_blocklog; fa->fsx_cowextsize = ip->i_d.di_cowextsize << ip->i_mount->m_sb.sb_blocklog; fa->fsx_projid = ip->i_d.di_projid; - -if (attr) { -if (ip->i_afp) { -if (ip->i_afp->if_flags &XFS_IFEXTENTS ) - fa->fsx_nextents =xfs_iext_count (ip->i_afp); -else - fa->fsx_nextents = ip->i_d.di_anextents; - }else - fa->fsx_nextents =0 ; - }else { -if (ip->i_df.if_flags &XFS_IFEXTENTS ) - fa->fsx_nextents =xfs_iext_count (&ip->i_df); -else - fa->fsx_nextents = ip->i_d.di_nextents; - } +if (ifp && (ifp->if_flags &XFS_IFEXTENTS )) + fa->fsx_nextents =xfs_iext_count (ifp); +else + fa->fsx_nextents =xfs_ifork_nextents (ifp); }STATIC int
@@ -1211,7 +1202,7 @@ xfs_ioctl_setattr_xflags(uint64_t di_flags2;/* Can't change realtime flag if any extents are allocated. */ -if ((ip->i_d.di_nextents || ip->i_delayed_blks) && +if ((ip->i_df.if_nextents || ip->i_delayed_blks) &&XFS_IS_REALTIME_INODE (ip) != (fa->fsx_xflags &FS_XFLAG_REALTIME ))return -EINVAL ;
@@ -1389,7 +1380,7 @@ xfs_ioctl_setattr_check_extsize(xfs_extlen_t size;xfs_fsblock_t extsize_fsb; -if (S_ISREG (VFS_I (ip)->i_mode) && ip->i_d.di_nextents && +if (S_ISREG (VFS_I (ip)->i_mode) && ip->i_df.if_nextents && ((ip->i_d.di_extsize << mp->m_sb.sb_blocklog) != fa->fsx_extsize))return -EINVAL ;
fs/xfs/xfs_iomap.c +1 -1
@@ -1258,7 +1258,7 @@ xfs_xattr_iomap_begin( lockmode =xfs_ilock_attr_map_shared (ip);/* if there are no attribute fork or extents, return ENOENT */ -if (!XFS_IFORK_Q (ip) || !ip->i_d.di_anextents) { +if (!XFS_IFORK_Q (ip) || !ip->i_afp->if_nextents) { error = -ENOENT ; goto out_unlock; }
fs/xfs/xfs_iops.c +1 -1
@@ -872,7 +872,7 @@ xfs_setattr_size(/* * Short circuit the truncate case for zero length files. */ -if (newsize ==0 && oldsize ==0 && ip->i_d.di_nextents ==0 ) { +if (newsize ==0 && oldsize ==0 && ip->i_df.if_nextents ==0 ) {if (!(iattr->ia_valid & (ATTR_CTIME |ATTR_MTIME )))return 0 ;
fs/xfs/xfs_itable.c +2 -2
@@ -104,9 +104,9 @@ xfs_bulkstat_one_int( buf->bs_xflags =xfs_ip2xflags (ip); buf->bs_extsize_blks = dic->di_extsize; - buf->bs_extents = dic->di_nextents; + buf->bs_extents =xfs_ifork_nextents (&ip->i_df);xfs_bulkstat_health (ip, buf); - buf->bs_aextents = dic->di_anextents; + buf->bs_aextents =xfs_ifork_nextents (ip->i_afp); buf->bs_forkoff =XFS_IFORK_BOFF (ip); buf->bs_version =XFS_BULKSTAT_VERSION_V5 ;
fs/xfs/xfs_qm_syscalls.c +1 -1
@@ -302,7 +302,7 @@ xfs_qm_scall_trunc_qfile( goto out_unlock; } -ASSERT (ip->i_d.di_nextents ==0 ); +ASSERT (ip->i_df.if_nextents ==0 );xfs_trans_ichgtime (tp, ip,XFS_ICHGTIME_MOD |XFS_ICHGTIME_CHG ); error =xfs_trans_commit (tp);
fs/xfs/xfs_quotaops.c +1 -1
@@ -36,7 +36,7 @@ xfs_qm_fill_state( } tstate->flags |=QCI_SYSFILE ; tstate->blocks = ip->i_d.di_nblocks; - tstate->nextents = ip->i_d.di_nextents; + tstate->nextents = ip->i_df.if_nextents; tstate->spc_timelimit = (u32 )q->qi_btimelimit; tstate->ino_timelimit = (u32 )q->qi_itimelimit; tstate->rt_spc_timelimit = (u32 )q->qi_rtbtimelimit;
fs/xfs/xfs_symlink.c +1 -1
@@ -384,7 +384,7 @@ xfs_inactive_symlink_rmt(* either 1 or 2 extents and that we can * free them all in one bunmapi call. */ -ASSERT (ip->i_d.di_nextents >0 && ip->i_d.di_nextents <=2 ); +ASSERT (ip->i_df.if_nextents >0 && ip->i_df.if_nextents <=2 ); error =xfs_trans_alloc (mp, &M_RES (mp)->tr_itruncate,0 ,0 ,0 , &tp);if (error)
fs/xfs/xfs_trace.h +1 -1
@@ -1898,7 +1898,7 @@ DECLARE_EVENT_CLASS(xfs_swap_extent_class, __entry->which = which; __entry->ino = ip->i_ino; __entry->format = ip->i_d.di_format; - __entry->nex = ip->i_d.di_nextents; + __entry->nex = ip->i_df.if_nextents; __entry->broot_size = ip->i_df.if_broot_bytes; __entry->fork_off =XFS_IFORK_BOFF (ip); ),
Signature · 1 line
2.26.2
PATCH 5/6 xfs: move the fork format fields into struct xfs_ifork
In reply to Christoph HellwigBoth the data and attr fork have a format that is stored in the legacy idinode. Move it into the xfs_ifork structure instead, where it uses up padding.
--- fs/xfs/libxfs/xfs_attr.c | 12 +-- fs/xfs/libxfs/xfs_attr_leaf.c | 32 ++++---- fs/xfs/libxfs/xfs_bmap.c | 120 +++++++++++++---------------- fs/xfs/libxfs/xfs_bmap_btree.c | 5 +- fs/xfs/libxfs/xfs_dir2.c | 8 +- fs/xfs/libxfs/xfs_dir2_sf.c | 13 ++-- fs/xfs/libxfs/xfs_inode_buf.c | 6 +- fs/xfs/libxfs/xfs_inode_buf.h | 2 - fs/xfs/libxfs/xfs_inode_fork.c | 14 ++-- fs/xfs/libxfs/xfs_inode_fork.h | 28 ++++--- fs/xfs/libxfs/xfs_symlink_remote.c | 16 ++-- fs/xfs/scrub/bmap.c | 5 +- fs/xfs/scrub/dabtree.c | 2 +- fs/xfs/scrub/dir.c | 7 +- fs/xfs/xfs_aops.c | 2 +- fs/xfs/xfs_attr_inactive.c | 2 +- fs/xfs/xfs_attr_list.c | 4 +- fs/xfs/xfs_bmap_util.c | 56 +++++++------- fs/xfs/xfs_dir2_readdir.c | 2 +- fs/xfs/xfs_icache.c | 1 - fs/xfs/xfs_inode.c | 36 ++++----- fs/xfs/xfs_inode.h | 2 - fs/xfs/xfs_inode_item.c | 12 +-- fs/xfs/xfs_iomap.c | 4 +- fs/xfs/xfs_itable.c | 2 +- fs/xfs/xfs_symlink.c | 2 +- fs/xfs/xfs_trace.h | 2 +- 27 files changed, 182 insertions(+), 215 deletions(-)
fs/xfs/libxfs/xfs_attr.c +6 -6
@@ -61,7 +61,7 @@ xfs_inode_hasattr( struct xfs_inode *ip) {if (!XFS_IFORK_Q (ip) || - (ip->i_d.di_aformat ==XFS_DINODE_FMT_EXTENTS && + (ip->i_afp->if_format ==XFS_DINODE_FMT_EXTENTS && ip->i_afp->if_nextents ==0 ))return 0 ;return 1 ;
@@ -84,7 +84,7 @@ xfs_attr_get_ilocked(if (!xfs_inode_hasattr (args->dp))return -ENOATTR ; -if (args->dp->i_d.di_aformat ==XFS_DINODE_FMT_LOCAL ) +if (args->dp->i_afp->if_format ==XFS_DINODE_FMT_LOCAL )return xfs_attr_shortform_getvalue (args);if (xfs_bmap_one_block (args->dp,XFS_ATTR_FORK ))return xfs_attr_leaf_get (args);
@@ -212,14 +212,14 @@ xfs_attr_set_args(* If the attribute list is non-existent or a shortform list, * upgrade it to a single-leaf-block attribute list. */ -if (dp->i_d.di_aformat ==XFS_DINODE_FMT_LOCAL || - (dp->i_d.di_aformat ==XFS_DINODE_FMT_EXTENTS && +if (dp->i_afp->if_format ==XFS_DINODE_FMT_LOCAL || + (dp->i_afp->if_format ==XFS_DINODE_FMT_EXTENTS && dp->i_afp->if_nextents ==0 )) {/* * Build initial attribute list (if required). */ -if (dp->i_d.di_aformat ==XFS_DINODE_FMT_EXTENTS ) +if (dp->i_afp->if_format ==XFS_DINODE_FMT_EXTENTS )xfs_attr_shortform_create (args);/*
@@ -272,7 +272,7 @@ xfs_attr_remove_args(if (!xfs_inode_hasattr (dp)) { error = -ENOATTR ; - }else if (dp->i_d.di_aformat ==XFS_DINODE_FMT_LOCAL ) { + }else if (dp->i_afp->if_format ==XFS_DINODE_FMT_LOCAL ) {ASSERT (dp->i_afp->if_flags &XFS_IFINLINE ); error =xfs_attr_shortform_remove (args); }else if (xfs_bmap_one_block (dp,XFS_ATTR_FORK )) {
fs/xfs/libxfs/xfs_attr_leaf.c +14 -18
@@ -539,7 +539,7 @@ xfs_attr_shortform_bytesfit(/* rounded down */ offset = (XFS_LITINO (mp) - bytes) >>3 ; -if (dp->i_d.di_format ==XFS_DINODE_FMT_DEV ) { +if (dp->i_df.if_format ==XFS_DINODE_FMT_DEV ) { minforkoff =roundup (sizeof (xfs_dev_t),8 ) >>3 ;return (offset >= minforkoff) ? minforkoff :0 ; }
@@ -567,7 +567,7 @@ xfs_attr_shortform_bytesfit( dsize = dp->i_df.if_bytes; -switch (dp->i_d.di_format) { +switch (dp->i_df.if_format) {case XFS_DINODE_FMT_EXTENTS :/* * If there is no attr fork and the data fork is extents,
@@ -636,22 +636,19 @@ xfs_sbversion_add_attr2(xfs_mount_t *mp, xfs_trans_t *tp)* Create the initial contents of a shortform attribute list. */ void -xfs_attr_shortform_create (xfs_da_args_t *args) +xfs_attr_shortform_create ( +struct xfs_da_args *args) { -xfs_attr_sf_hdr_t *hdr; -xfs_inode_t *dp; -struct xfs_ifork *ifp; +struct xfs_inode *dp = args->dp; +struct xfs_ifork *ifp = dp->i_afp; +struct xfs_attr_sf_hdr *hdr;trace_xfs_attr_sf_create (args); - dp = args->dp; -ASSERT (dp !=NULL ); - ifp = dp->i_afp; -ASSERT (ifp !=NULL );ASSERT (ifp->if_bytes ==0 ); -if (dp->i_d.di_aformat ==XFS_DINODE_FMT_EXTENTS ) { +if (ifp->if_format ==XFS_DINODE_FMT_EXTENTS ) { ifp->if_flags &= ~XFS_IFEXTENTS ;/* just in case */ - dp->i_d.di_aformat =XFS_DINODE_FMT_LOCAL ; + ifp->if_format =XFS_DINODE_FMT_LOCAL ; ifp->if_flags |=XFS_IFINLINE ; }else {ASSERT (ifp->if_flags &XFS_IFINLINE );
@@ -723,7 +720,6 @@ xfs_attr_fork_remove(xfs_idestroy_fork (ip,XFS_ATTR_FORK ); ip->i_d.di_forkoff =0 ; - ip->i_d.di_aformat =XFS_DINODE_FMT_EXTENTS ;ASSERT (ip->i_afp ==NULL );
@@ -776,7 +772,7 @@ xfs_attr_shortform_remove(xfs_da_args_t *args) totsize -= size;if (totsize ==sizeof (xfs_attr_sf_hdr_t) && (mp->m_flags &XFS_MOUNT_ATTR2 ) && - (dp->i_d.di_format !=XFS_DINODE_FMT_BTREE ) && + (dp->i_df.if_format !=XFS_DINODE_FMT_BTREE ) && !(args->op_flags &XFS_DA_OP_ADDNAME )) {xfs_attr_fork_remove (dp, args->trans); }else {
@@ -786,7 +782,7 @@ xfs_attr_shortform_remove(xfs_da_args_t *args)ASSERT (totsize >sizeof (xfs_attr_sf_hdr_t) || (args->op_flags &XFS_DA_OP_ADDNAME ) || !(mp->m_flags &XFS_MOUNT_ATTR2 ) || - dp->i_d.di_format ==XFS_DINODE_FMT_BTREE ); + dp->i_df.if_format ==XFS_DINODE_FMT_BTREE );xfs_trans_log_inode (args->trans, dp,XFS_ILOG_CORE |XFS_ILOG_ADATA ); }
@@ -963,7 +959,7 @@ xfs_attr_shortform_allfit( +be16_to_cpu (name_loc->valuelen); }if ((dp->i_mount->m_flags &XFS_MOUNT_ATTR2 ) && - (dp->i_d.di_format !=XFS_DINODE_FMT_BTREE ) && + (dp->i_df.if_format !=XFS_DINODE_FMT_BTREE ) && (bytes ==sizeof (struct xfs_attr_sf_hdr )))return -1 ;return xfs_attr_shortform_bytesfit (dp, bytes);
@@ -982,7 +978,7 @@ xfs_attr_shortform_verify(int i;int64_t size; -ASSERT (ip->i_d.di_aformat ==XFS_DINODE_FMT_LOCAL ); +ASSERT (ip->i_afp->if_format ==XFS_DINODE_FMT_LOCAL ); ifp =XFS_IFORK_PTR (ip,XFS_ATTR_FORK ); sfp = (struct xfs_attr_shortform *)ifp->if_u1.if_data; size = ifp->if_bytes;
@@ -1086,7 +1082,7 @@ xfs_attr3_leaf_to_shortform(if (forkoff ==-1 ) {ASSERT (dp->i_mount->m_flags &XFS_MOUNT_ATTR2 ); -ASSERT (dp->i_d.di_format !=XFS_DINODE_FMT_BTREE ); +ASSERT (dp->i_df.if_format !=XFS_DINODE_FMT_BTREE );xfs_attr_fork_remove (dp, args->trans); goto out; }
fs/xfs/libxfs/xfs_bmap.c +54 -66
411 lines not on this page · raw message
fs/xfs/libxfs/xfs_bmap_btree.c +1 -4
@@ -636,10 +636,7 @@ xfs_bmbt_change_owner(ASSERT (tp || buffer_list);ASSERT (!(tp && buffer_list)); -if (whichfork ==XFS_DATA_FORK ) -ASSERT (ip->i_d.di_format ==XFS_DINODE_FMT_BTREE ); -else -ASSERT (ip->i_d.di_aformat ==XFS_DINODE_FMT_BTREE ); +ASSERT (XFS_IFORK_PTR (ip, whichfork)->if_format ==XFS_DINODE_FMT_BTREE ); cur =xfs_bmbt_init_cursor (ip->i_mount, tp, ip, whichfork);if (!cur)
fs/xfs/libxfs/xfs_dir2.c +4 -4
@@ -278,7 +278,7 @@ xfs_dir_createname(if (!inum) args->op_flags |=XFS_DA_OP_JUSTCHECK ; -if (dp->i_d.di_format ==XFS_DINODE_FMT_LOCAL ) { +if (dp->i_df.if_format ==XFS_DINODE_FMT_LOCAL ) { rval =xfs_dir2_sf_addname (args); goto out_free; }
@@ -373,7 +373,7 @@ xfs_dir_lookup( args->op_flags |=XFS_DA_OP_CILOOKUP ; lock_mode =xfs_ilock_data_map_shared (dp); -if (dp->i_d.di_format ==XFS_DINODE_FMT_LOCAL ) { +if (dp->i_df.if_format ==XFS_DINODE_FMT_LOCAL ) { rval =xfs_dir2_sf_lookup (args); goto out_check_rval; }
@@ -443,7 +443,7 @@ xfs_dir_removename( args->whichfork =XFS_DATA_FORK ; args->trans = tp; -if (dp->i_d.di_format ==XFS_DINODE_FMT_LOCAL ) { +if (dp->i_df.if_format ==XFS_DINODE_FMT_LOCAL ) { rval =xfs_dir2_sf_removename (args); goto out_free; }
@@ -504,7 +504,7 @@ xfs_dir_replace( args->whichfork =XFS_DATA_FORK ; args->trans = tp; -if (dp->i_d.di_format ==XFS_DINODE_FMT_LOCAL ) { +if (dp->i_df.if_format ==XFS_DINODE_FMT_LOCAL ) { rval =xfs_dir2_sf_replace (args); goto out_free; }
fs/xfs/libxfs/xfs_dir2_sf.c +6 -7
@@ -343,7 +343,7 @@ xfs_dir2_block_to_sf(*/ ASSERT (dp->i_df.if_bytes ==0 );xfs_init_local_fork (dp,XFS_DATA_FORK , sfp, size); - dp->i_d.di_format =XFS_DINODE_FMT_LOCAL ; + dp->i_df.if_format =XFS_DINODE_FMT_LOCAL ; dp->i_d.di_size = size; logflags |=XFS_ILOG_DDATA ;
@@ -710,11 +710,11 @@ xfs_dir2_sf_verify( struct xfs_inode *ip) {struct xfs_mount *mp = ip->i_mount; +struct xfs_ifork *ifp =XFS_IFORK_PTR (ip,XFS_DATA_FORK );struct xfs_dir2_sf_hdr *sfp;struct xfs_dir2_sf_entry *sfep;struct xfs_dir2_sf_entry *next_sfep;char *endp; -struct xfs_ifork *ifp;xfs_ino_t ino;int i;int i8count;
@@ -723,9 +723,8 @@ xfs_dir2_sf_verify(int error;uint8_t filetype; -ASSERT (ip->i_d.di_format ==XFS_DINODE_FMT_LOCAL ); +ASSERT (ifp->if_format ==XFS_DINODE_FMT_LOCAL ); - ifp =XFS_IFORK_PTR (ip,XFS_DATA_FORK ); sfp = (struct xfs_dir2_sf_hdr *)ifp->if_u1.if_data; size = ifp->if_bytes;
@@ -827,9 +826,9 @@ xfs_dir2_sf_create(* If it's currently a zero-length extent file, * convert it to local format. */ -if (dp->i_d.di_format ==XFS_DINODE_FMT_EXTENTS ) { +if (dp->i_df.if_format ==XFS_DINODE_FMT_EXTENTS ) { dp->i_df.if_flags &= ~XFS_IFEXTENTS ;/* just in case */ - dp->i_d.di_format =XFS_DINODE_FMT_LOCAL ; + dp->i_df.if_format =XFS_DINODE_FMT_LOCAL ;xfs_trans_log_inode (args->trans, dp,XFS_ILOG_CORE ); dp->i_df.if_flags |=XFS_IFINLINE ; }
@@ -1027,7 +1026,7 @@ xfs_dir2_sf_replace_needblock(int newsize;struct xfs_dir2_sf_hdr *sfp; -if (dp->i_d.di_format !=XFS_DINODE_FMT_LOCAL ) +if (dp->i_df.if_format !=XFS_DINODE_FMT_LOCAL )return false; sfp = (struct xfs_dir2_sf_hdr *)dp->i_df.if_u1.if_data;
fs/xfs/libxfs/xfs_inode_buf.c +2 -4
@@ -225,7 +225,6 @@ xfs_inode_from_disk(be16_to_cpu (from->di_projid_lo); } - to->di_format = from->di_format;i_uid_write (inode,be32_to_cpu (from->di_uid));i_gid_write (inode,be32_to_cpu (from->di_gid));
@@ -246,7 +245,6 @@ xfs_inode_from_disk( to->di_nblocks =be64_to_cpu (from->di_nblocks); to->di_extsize =be32_to_cpu (from->di_extsize); to->di_forkoff = from->di_forkoff; - to->di_aformat = from->di_aformat; 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);
@@ -289,7 +287,7 @@ xfs_inode_to_disk( to->di_magic =cpu_to_be16 (XFS_DINODE_MAGIC ); to->di_onlink =0 ; - to->di_format = from->di_format; + to->di_format =xfs_ifork_format (&ip->i_df); to->di_uid =cpu_to_be32 (i_uid_read (inode)); to->di_gid =cpu_to_be32 (i_gid_read (inode)); to->di_projid_lo =cpu_to_be16 (from->di_projid &0xffff );
@@ -312,7 +310,7 @@ xfs_inode_to_disk( 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_aformat = from->di_aformat; + 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); to->di_flags =cpu_to_be16 (from->di_flags);
fs/xfs/libxfs/xfs_inode_buf.h +0 -2
@@ -16,14 +16,12 @@ struct xfs_dinode;* format specific structures at the appropriate time. */ struct xfs_icdinode { -int8_t di_format;/* format of di_c data */ uint16_t di_flushiter;/* incremented on flush */ uint32_t di_projid;/* owner's project id */ xfs_fsize_t di_size;/* number of bytes in file */ xfs_rfsblock_t di_nblocks;/* # of direct & btree blocks used */ xfs_extlen_t di_extsize;/* basic/minimum extent size for file */ uint8_t di_forkoff;/* attr fork offs, <<3 for 64b align */ -int8_t di_aformat;/* format of attr fork's data */ uint32_t di_dmevmask;/* DMIG event mask */ uint16_t di_dmstate;/* DMIG state info */ uint16_t di_flags;/* random flags, XFS_DIFLAG_... */
fs/xfs/libxfs/xfs_inode_fork.c +9 -5
@@ -232,6 +232,7 @@ xfs_iformat_data_fork(* Initialize the extent count early, as the per-format routines may * depend on it. */ + ip->i_df.if_format = dip->di_format; ip->i_df.if_nextents =be32_to_cpu (dip->di_nextents);switch (inode->i_mode &S_IFMT ) {
@@ -245,7 +246,7 @@ xfs_iformat_data_fork(case S_IFREG :case S_IFLNK :case S_IFDIR : -switch (dip->di_format) { +switch (ip->i_df.if_format) {case XFS_DINODE_FMT_LOCAL : error =xfs_iformat_local (ip, dip,XFS_DATA_FORK ,be64_to_cpu (dip->di_size));
@@ -291,9 +292,12 @@ xfs_iformat_attr_fork(* depend on it. */ ip->i_afp =kmem_zone_zalloc (xfs_ifork_zone,KM_NOFS ); + ip->i_afp->if_format = dip->di_aformat; +if (unlikely (ip->i_afp->if_format ==0 ))/* pre IRIX 6.2 file system */ + ip->i_afp->if_format =XFS_DINODE_FMT_EXTENTS ; ip->i_afp->if_nextents =be16_to_cpu (dip->di_anextents); -switch (dip->di_aformat) { +switch (ip->i_afp->if_format) {case XFS_DINODE_FMT_LOCAL : error =xfs_iformat_local (ip, dip,XFS_ATTR_FORK ,xfs_dfork_attr_shortform_size (dip));
@@ -516,7 +520,7 @@ xfs_idestroy_fork(* not local then we may or may not have an extents list, * so check and free it up if we do. */ -if (XFS_IFORK_FORMAT (ip, whichfork) ==XFS_DINODE_FMT_LOCAL ) { +if (ifp->if_format ==XFS_DINODE_FMT_LOCAL ) {if (ifp->if_u1.if_data !=NULL ) {kmem_free (ifp->if_u1.if_data); ifp->if_u1.if_data =NULL ;
@@ -613,7 +617,7 @@ xfs_iflush_fork( } cp =XFS_DFORK_PTR (dip, whichfork); mp = ip->i_mount; -switch (XFS_IFORK_FORMAT (ip, whichfork)) { +switch (ifp->if_format) {case XFS_DINODE_FMT_LOCAL :if ((iip->ili_fields & dataflag[whichfork]) && (ifp->if_bytes >0 )) {
@@ -686,7 +690,7 @@ xfs_ifork_init_cow( ip->i_cowfp =kmem_zone_zalloc (xfs_ifork_zone,KM_NOFS ); ip->i_cowfp->if_flags =XFS_IFEXTENTS ; - ip->i_cformat =XFS_DINODE_FMT_EXTENTS ; + ip->i_cowfp->if_format =XFS_DINODE_FMT_EXTENTS ; }/* Verify the inline contents of the data fork of an inode. */
fs/xfs/libxfs/xfs_inode_fork.h +13 -15
@@ -23,6 +23,7 @@ struct xfs_ifork { } if_u1;short if_broot_bytes;/* bytes allocated for root */ unsigned char if_flags;/* per-fork flags */ +int8_t if_format;/* format of this fork */ xfs_extnum_t if_nextents;/* # of extents in this fork */ };
@@ -56,24 +57,14 @@ struct xfs_ifork { ((w) == XFS_ATTR_FORK ? \ XFS_IFORK_ASIZE(ip) : \ 0)) -#define XFS_IFORK_FORMAT (ip,w) \ - ((w) == XFS_DATA_FORK ? \ - (ip)->i_d.di_format : \ - ((w) == XFS_ATTR_FORK ? \ - (ip)->i_d.di_aformat : \ - (ip)->i_cformat)) -#define XFS_IFORK_FMT_SET (ip,w,n) \ - ((w) == XFS_DATA_FORK ? \ - ((ip)->i_d.di_format = (n)) : \ - ((w) == XFS_ATTR_FORK ? \ - ((ip)->i_d.di_aformat = (n)) : \ - ((ip)->i_cformat = (n))))#define XFS_IFORK_MAXEXT (ip, w) \ (XFS_IFORK_SIZE(ip, w) / sizeof(xfs_bmbt_rec_t)) -#define xfs_ifork_has_extents (ip, w) \ - (XFS_IFORK_FORMAT((ip), (w)) == XFS_DINODE_FMT_EXTENTS || \ - XFS_IFORK_FORMAT((ip), (w)) == XFS_DINODE_FMT_BTREE) +static inline bool xfs_ifork_has_extents (struct xfs_ifork *ifp) +{ +return ifp->if_format ==XFS_DINODE_FMT_EXTENTS || + ifp->if_format ==XFS_DINODE_FMT_BTREE ; +}static inline xfs_extnum_t xfs_ifork_nextents (struct xfs_ifork *ifp) {
@@ -82,6 +73,13 @@ static inline xfs_extnum_t xfs_ifork_nextents(struct xfs_ifork *ifp)return ifp->if_nextents; } +static inline int8_t xfs_ifork_format (struct xfs_ifork *ifp) +{ +if (!ifp) +return XFS_DINODE_FMT_EXTENTS ; +return ifp->if_format; +} +struct xfs_ifork *xfs_iext_state_to_fork (struct xfs_inode *ip,int state);int xfs_iformat_data_fork (struct xfs_inode *,struct xfs_dinode *);
fs/xfs/libxfs/xfs_symlink_remote.c +6 -10
@@ -204,16 +204,12 @@ xfs_failaddr_txfs_symlink_shortform_verify ( struct xfs_inode *ip) { -char *sfp; -char *endp; -struct xfs_ifork *ifp; -int size; - -ASSERT (ip->i_d.di_format ==XFS_DINODE_FMT_LOCAL ); - ifp =XFS_IFORK_PTR (ip,XFS_DATA_FORK ); - sfp = (char *)ifp->if_u1.if_data; - size = ifp->if_bytes; - endp = sfp + size; +struct xfs_ifork *ifp =XFS_IFORK_PTR (ip,XFS_DATA_FORK ); +char *sfp = (char *)ifp->if_u1.if_data; +int size = ifp->if_bytes; +char *endp = sfp + size; + +ASSERT (ifp->if_format ==XFS_DINODE_FMT_LOCAL );/* * Zero length symlinks should never occur in memory as they are
fs/xfs/scrub/bmap.c +3 -2
@@ -589,12 +589,13 @@ xchk_bmap_check_rmaps(* to flag this bmap as corrupt if there are rmaps that need to be * reattached. */ +if (whichfork ==XFS_DATA_FORK ) zero_size =i_size_read (VFS_I (sc->ip)) ==0 ;else zero_size = false; -if (XFS_IFORK_FORMAT (sc->ip, whichfork) !=XFS_DINODE_FMT_BTREE && +if (ifp->if_format !=XFS_DINODE_FMT_BTREE && (zero_size || ifp->if_nextents >0 ))return 0 ;
@@ -657,7 +658,7 @@ xchk_bmap( }/* Check the fork values */ -switch (XFS_IFORK_FORMAT (ip, whichfork)) { +switch (ifp->if_format) {case XFS_DINODE_FMT_UUID :case XFS_DINODE_FMT_DEV :case XFS_DINODE_FMT_LOCAL :
fs/xfs/scrub/dabtree.c +1 -1
@@ -468,7 +468,7 @@ xchk_da_btree(int error;/* Skip short format data structures; no btree to scan. */ -if (!xfs_ifork_has_extents (sc->ip, whichfork)) +if (!xfs_ifork_has_extents (XFS_IFORK_PTR (sc->ip, whichfork)))return 0 ;/* Set up initial da state. */
fs/xfs/scrub/dir.c +3 -4
@@ -635,7 +635,7 @@ xchk_directory_blocks( {struct xfs_bmbt_irec got;struct xfs_da_args args; -struct xfs_ifork *ifp; +struct xfs_ifork *ifp =XFS_IFORK_PTR (sc->ip,XFS_DATA_FORK );struct xfs_mount *mp = sc->mp;xfs_fileoff_t leaf_lblk;xfs_fileoff_t free_lblk;
@@ -647,11 +647,10 @@ xchk_directory_blocks(int error;/* Ignore local format directories. */ -if (sc->ip->i_d.di_format !=XFS_DINODE_FMT_EXTENTS && - sc->ip->i_d.di_format !=XFS_DINODE_FMT_BTREE ) +if (ifp->if_format !=XFS_DINODE_FMT_EXTENTS && + ifp->if_format !=XFS_DINODE_FMT_BTREE )return 0 ; - ifp =XFS_IFORK_PTR (sc->ip,XFS_DATA_FORK ); lblk =XFS_B_TO_FSB (mp,XFS_DIR2_DATA_OFFSET ); leaf_lblk =XFS_B_TO_FSB (mp,XFS_DIR2_LEAF_OFFSET ); free_lblk =XFS_B_TO_FSB (mp,XFS_DIR2_FREE_OFFSET );
fs/xfs/xfs_aops.c +1 -1
@@ -382,7 +382,7 @@ xfs_map_blocks(*/ retry:xfs_ilock (ip,XFS_ILOCK_SHARED ); -ASSERT (ip->i_d.di_format !=XFS_DINODE_FMT_BTREE || +ASSERT (ip->i_df.if_format !=XFS_DINODE_FMT_BTREE || (ip->i_df.if_flags &XFS_IFEXTENTS ));/*
fs/xfs/xfs_attr_inactive.c +1 -1
@@ -367,7 +367,7 @@ xfs_attr_inactive(* removal below. */ if (xfs_inode_hasattr (dp) && - dp->i_d.di_aformat !=XFS_DINODE_FMT_LOCAL ) { + dp->i_afp->if_format !=XFS_DINODE_FMT_LOCAL ) { error =xfs_attr3_root_inactive (&trans, dp);if (error) goto out_cancel;
fs/xfs/xfs_attr_list.c +2 -2
@@ -512,9 +512,9 @@ xfs_attr_list_ilocked(*/ if (!xfs_inode_hasattr (dp))return 0 ; -else if (dp->i_d.di_aformat ==XFS_DINODE_FMT_LOCAL ) +if (dp->i_afp->if_format ==XFS_DINODE_FMT_LOCAL )return xfs_attr_shortform_list (context); -else if (xfs_bmap_one_block (dp,XFS_ATTR_FORK )) +if (xfs_bmap_one_block (dp,XFS_ATTR_FORK ))return xfs_attr_leaf_list (context);return xfs_attr_node_list (context); }
fs/xfs/xfs_bmap_util.c +28 -28
152 lines not on this page · raw message
fs/xfs/xfs_dir2_readdir.c +1 -1
@@ -524,7 +524,7 @@ xfs_readdir( args.geo = dp->i_mount->m_dir_geo; args.trans = tp; -if (dp->i_d.di_format ==XFS_DINODE_FMT_LOCAL ) +if (dp->i_df.if_format ==XFS_DINODE_FMT_LOCAL ) rval =xfs_dir2_sf_getdents (&args, ctx);else if ((rval =xfs_dir2_isblock (&args, &v))) ;
fs/xfs/xfs_icache.c +0 -1
@@ -63,7 +63,6 @@ xfs_inode_alloc(memset (&ip->i_imap,0 ,sizeof (struct xfs_imap )); ip->i_afp =NULL ; ip->i_cowfp =NULL ; - ip->i_cformat =XFS_DINODE_FMT_EXTENTS ;memset (&ip->i_df,0 ,sizeof (ip->i_df)); ip->i_flags =0 ; ip->i_delayed_blks =0 ;
fs/xfs/xfs_inode.c +16 -20
@@ -112,7 +112,7 @@ xfs_ilock_data_map_shared( {uint lock_mode =XFS_ILOCK_SHARED ; -if (ip->i_d.di_format ==XFS_DINODE_FMT_BTREE && +if (ip->i_df.if_format ==XFS_DINODE_FMT_BTREE && (ip->i_df.if_flags &XFS_IFEXTENTS ) ==0 ) lock_mode =XFS_ILOCK_EXCL ;xfs_ilock (ip, lock_mode);
@@ -125,7 +125,8 @@ xfs_ilock_attr_map_shared( {uint lock_mode =XFS_ILOCK_SHARED ; -if (ip->i_d.di_aformat ==XFS_DINODE_FMT_BTREE && +if (ip->i_afp && + ip->i_afp->if_format ==XFS_DINODE_FMT_BTREE && (ip->i_afp->if_flags &XFS_IFEXTENTS ) ==0 ) lock_mode =XFS_ILOCK_EXCL ;xfs_ilock (ip, lock_mode);
@@ -851,7 +852,7 @@ xfs_ialloc(case S_IFCHR :case S_IFBLK :case S_IFSOCK : - ip->i_d.di_format =XFS_DINODE_FMT_DEV ; + ip->i_df.if_format =XFS_DINODE_FMT_DEV ; ip->i_df.if_flags =0 ; flags |=XFS_ILOG_DEV ;break ;
@@ -907,7 +908,7 @@ xfs_ialloc( }/* FALLTHROUGH */ case S_IFLNK : - ip->i_d.di_format =XFS_DINODE_FMT_EXTENTS ; + ip->i_df.if_format =XFS_DINODE_FMT_EXTENTS ; ip->i_df.if_flags =XFS_IFEXTENTS ; ip->i_df.if_bytes =0 ; ip->i_df.if_u1.if_root =NULL ;
@@ -915,10 +916,6 @@ xfs_ialloc(default :ASSERT (0 ); } -/* -* Attribute fork settings for new inode. -*/ - ip->i_d.di_aformat =XFS_DINODE_FMT_EXTENTS ;/* * Log the new values stuffed into the inode.
@@ -2749,7 +2746,7 @@ xfs_ifree(* data fork to extents format. Note that the attr fork data has * already been freed by xfs_attr_inactive. */ -if (ip->i_d.di_format ==XFS_DINODE_FMT_LOCAL ) { +if (ip->i_df.if_format ==XFS_DINODE_FMT_LOCAL ) {kmem_free (ip->i_df.if_u1.if_data); ip->i_df.if_u1.if_data =NULL ; ip->i_df.if_bytes =0 ;
@@ -2760,8 +2757,7 @@ xfs_ifree( 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_d.di_format =XFS_DINODE_FMT_EXTENTS ; - ip->i_d.di_aformat =XFS_DINODE_FMT_EXTENTS ; + ip->i_df.if_format =XFS_DINODE_FMT_EXTENTS ;/* Don't attempt to replay owner changes for a deleted inode */ ip->i_itemp->ili_fields &= ~(XFS_ILOG_AOWNER |XFS_ILOG_DOWNER );
@@ -3624,7 +3620,7 @@ xfs_iflush(ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL |XFS_ILOCK_SHARED ));ASSERT (xfs_isiflocked (ip)); -ASSERT (ip->i_d.di_format !=XFS_DINODE_FMT_BTREE || +ASSERT (ip->i_df.if_format !=XFS_DINODE_FMT_BTREE || ip->i_df.if_nextents >XFS_IFORK_MAXEXT (ip,XFS_DATA_FORK )); *bpp =NULL ;
@@ -3706,7 +3702,7 @@ xfs_iflush_int(ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL |XFS_ILOCK_SHARED ));ASSERT (xfs_isiflocked (ip)); -ASSERT (ip->i_d.di_format !=XFS_DINODE_FMT_BTREE || +ASSERT (ip->i_df.if_format !=XFS_DINODE_FMT_BTREE || ip->i_df.if_nextents >XFS_IFORK_MAXEXT (ip,XFS_DATA_FORK ));ASSERT (iip !=NULL && iip->ili_fields !=0 );
@@ -3728,8 +3724,8 @@ xfs_iflush_int( }if (S_ISREG (VFS_I (ip)->i_mode)) {if (XFS_TEST_ERROR ( - (ip->i_d.di_format !=XFS_DINODE_FMT_EXTENTS ) && - (ip->i_d.di_format !=XFS_DINODE_FMT_BTREE ), + ip->i_df.if_format !=XFS_DINODE_FMT_EXTENTS && + ip->i_df.if_format !=XFS_DINODE_FMT_BTREE , mp,XFS_ERRTAG_IFLUSH_3 )) { xfs_alert_tag(mp, XFS_PTAG_IFLUSH, "%s: Bad regular inode %Lu, ptr "PTR_FMT,
@@ -3738,9 +3734,9 @@ xfs_iflush_int( } }else if (S_ISDIR (VFS_I (ip)->i_mode)) {if (XFS_TEST_ERROR ( - (ip->i_d.di_format !=XFS_DINODE_FMT_EXTENTS ) && - (ip->i_d.di_format !=XFS_DINODE_FMT_BTREE ) && - (ip->i_d.di_format !=XFS_DINODE_FMT_LOCAL ), + ip->i_df.if_format !=XFS_DINODE_FMT_EXTENTS && + ip->i_df.if_format !=XFS_DINODE_FMT_BTREE && + ip->i_df.if_format !=XFS_DINODE_FMT_LOCAL , mp,XFS_ERRTAG_IFLUSH_4 )) { xfs_alert_tag(mp, XFS_PTAG_IFLUSH, "%s: Bad directory inode %Lu, ptr "PTR_FMT,
@@ -3782,10 +3778,10 @@ xfs_iflush_int(* If there are inline format data / attr forks attached to this inode, * make sure they are not corrupt. */ -if (ip->i_d.di_format ==XFS_DINODE_FMT_LOCAL && +if (ip->i_df.if_format ==XFS_DINODE_FMT_LOCAL &&xfs_ifork_verify_local_data (ip)) goto flush_out; -if (ip->i_d.di_aformat ==XFS_DINODE_FMT_LOCAL && +if (ip->i_afp && ip->i_afp->if_format ==XFS_DINODE_FMT_LOCAL &&xfs_ifork_verify_local_attr (ip)) goto flush_out;
fs/xfs/xfs_inode.h +0 -2
@@ -57,8 +57,6 @@ typedef struct xfs_inode {struct xfs_icdinode i_d;/* most of ondisk inode */ -unsigned int i_cformat;/* format of cow fork */ -/* VFS inode */ struct inode i_vnode;/* embedded VFS inode */
fs/xfs/xfs_inode_item.c +6 -6
@@ -36,7 +36,7 @@ xfs_inode_item_data_fork_size( {struct xfs_inode *ip = iip->ili_inode; -switch (ip->i_d.di_format) { +switch (ip->i_df.if_format) {case XFS_DINODE_FMT_EXTENTS : if ((iip->ili_fields & XFS_ILOG_DEXT) && ip->i_df.if_nextents > 0 &&
@@ -77,7 +77,7 @@ xfs_inode_item_attr_fork_size( {struct xfs_inode *ip = iip->ili_inode; -switch (ip->i_d.di_aformat) { +switch (ip->i_afp->if_format) {case XFS_DINODE_FMT_EXTENTS : if ((iip->ili_fields & XFS_ILOG_AEXT) && ip->i_afp->if_nextents > 0 &&
@@ -142,7 +142,7 @@ xfs_inode_item_format_data_fork(struct xfs_inode *ip = iip->ili_inode;size_t data_bytes; -switch (ip->i_d.di_format) { +switch (ip->i_df.if_format) {case XFS_DINODE_FMT_EXTENTS : iip->ili_fields &= ~(XFS_ILOG_DDATA |XFS_ILOG_DBROOT |XFS_ILOG_DEV );
@@ -227,7 +227,7 @@ xfs_inode_item_format_attr_fork(struct xfs_inode *ip = iip->ili_inode;size_t data_bytes; -switch (ip->i_d.di_aformat) { +switch (ip->i_afp->if_format) {case XFS_DINODE_FMT_EXTENTS : iip->ili_fields &= ~(XFS_ILOG_ADATA |XFS_ILOG_ABROOT );
@@ -305,7 +305,7 @@ xfs_inode_to_log_dinode(struct inode *inode =VFS_I (ip); to->di_magic =XFS_DINODE_MAGIC ; - to->di_format = from->di_format; + to->di_format =xfs_ifork_format (&ip->i_df); to->di_uid =i_uid_read (inode); to->di_gid =i_gid_read (inode); to->di_projid_lo = from->di_projid &0xffff ;
@@ -329,7 +329,7 @@ xfs_inode_to_log_dinode( 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_aformat = from->di_aformat; + to->di_aformat =xfs_ifork_format (ip->i_afp); to->di_dmevmask = from->di_dmevmask; to->di_dmstate = from->di_dmstate; to->di_flags = from->di_flags;
fs/xfs/xfs_iomap.c +2 -2
@@ -856,7 +856,7 @@ xfs_buffered_write_iomap_begin(xfs_ilock (ip,XFS_ILOCK_EXCL ); -if (XFS_IS_CORRUPT (mp, !xfs_ifork_has_extents (ip,XFS_DATA_FORK )) || +if (XFS_IS_CORRUPT (mp, !xfs_ifork_has_extents (&ip->i_df)) ||XFS_TEST_ERROR (false, mp,XFS_ERRTAG_BMAPIFORMAT )) { error = -EFSCORRUPTED ; goto out_unlock;
@@ -1263,7 +1263,7 @@ xfs_xattr_iomap_begin( goto out_unlock; } -ASSERT (ip->i_d.di_aformat !=XFS_DINODE_FMT_LOCAL ); +ASSERT (ip->i_afp->if_format !=XFS_DINODE_FMT_LOCAL ); error =xfs_bmapi_read (ip, offset_fsb, end_fsb - offset_fsb, &imap, &nimaps,XFS_BMAPI_ATTRFORK ); out_unlock:
fs/xfs/xfs_itable.c +1 -1
@@ -115,7 +115,7 @@ xfs_bulkstat_one_int( buf->bs_cowextsize_blks = dic->di_cowextsize; } -switch (dic->di_format) { +switch (ip->i_df.if_format) {case XFS_DINODE_FMT_DEV : buf->bs_rdev =sysv_encode_dev (inode->i_rdev); buf->bs_blksize =BLKDEV_IOSIZE ;
fs/xfs/xfs_symlink.c +1 -1
@@ -251,7 +251,7 @@ xfs_symlink(xfs_init_local_fork (ip,XFS_DATA_FORK , target_path, pathlen); ip->i_d.di_size = pathlen; - ip->i_d.di_format =XFS_DINODE_FMT_LOCAL ; + ip->i_df.if_format =XFS_DINODE_FMT_LOCAL ;xfs_trans_log_inode (tp, ip,XFS_ILOG_DDATA |XFS_ILOG_CORE ); }else {int offset;
fs/xfs/xfs_trace.h +1 -1
@@ -1897,7 +1897,7 @@ DECLARE_EVENT_CLASS(xfs_swap_extent_class, __entry->dev =VFS_I (ip)->i_sb->s_dev; __entry->which = which; __entry->ino = ip->i_ino; - __entry->format = ip->i_d.di_format; + __entry->format = ip->i_df.if_format; __entry->nex = ip->i_df.if_nextents; __entry->broot_size = ip->i_df.if_broot_bytes; __entry->fork_off =XFS_IFORK_BOFF (ip);
Signature · 1 line
2.26.2
PATCH 6/6 xfs: cleanup xfs_idestroy_fork
In reply to Christoph HellwigMove freeing the dynamically allocated attr and COW fork, as well as zeroing the pointers where actually needed into the callers, and just pass the xfs_ifork structure to xfs_idestroy_fork. Also simplify the kmem_free calls by not checking for NULL first.
--- fs/xfs/libxfs/xfs_attr_leaf.c | 7 +++---- fs/xfs/libxfs/xfs_inode_buf.c | 2 +- fs/xfs/libxfs/xfs_inode_fork.c | 32 +++++++++----------------------- fs/xfs/libxfs/xfs_inode_fork.h | 2 +- fs/xfs/xfs_attr_inactive.c | 7 +++++-- fs/xfs/xfs_icache.c | 15 +++++++++------ 6 files changed, 28 insertions(+), 37 deletions(-)
fs/xfs/libxfs/xfs_attr_leaf.c +3 -4
@@ -718,11 +718,10 @@ xfs_attr_fork_remove( {ASSERT (ip->i_afp->if_nextents ==0 ); -xfs_idestroy_fork (ip,XFS_ATTR_FORK ); +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 ; - -ASSERT (ip->i_afp ==NULL ); -xfs_trans_log_inode (tp, ip,XFS_ILOG_CORE ); }
fs/xfs/libxfs/xfs_inode_buf.c +1 -1
@@ -271,7 +271,7 @@ xfs_inode_from_disk(return 0 ; out_destroy_data_fork: -xfs_idestroy_fork (ip,XFS_DATA_FORK ); +xfs_idestroy_fork (&ip->i_df);return error; }
fs/xfs/libxfs/xfs_inode_fork.c +9 -23
@@ -503,38 +503,24 @@ xfs_idata_realloc(void xfs_idestroy_fork ( -xfs_inode_t *ip, -int whichfork) +struct xfs_ifork *ifp) { -struct xfs_ifork *ifp; - - ifp =XFS_IFORK_PTR (ip, whichfork);if (ifp->if_broot !=NULL ) {kmem_free (ifp->if_broot); ifp->if_broot =NULL ; }/* -* If the format is local, then we can't have an extents -* array so just look for an inline data array. If we're -* not local then we may or may not have an extents list, -* so check and free it up if we do. +* If the format is local, then we can't have an extents array so just +* look for an inline data array. If we're not local then we may or may +* not have an extents list, so check and free it up if we do. */ if (ifp->if_format ==XFS_DINODE_FMT_LOCAL ) { -if (ifp->if_u1.if_data !=NULL ) { -kmem_free (ifp->if_u1.if_data); - ifp->if_u1.if_data =NULL ; - } - }else if ((ifp->if_flags &XFS_IFEXTENTS ) && ifp->if_height) { -xfs_iext_destroy (ifp); - } - -if (whichfork ==XFS_ATTR_FORK ) { -kmem_cache_free (xfs_ifork_zone, ip->i_afp); - ip->i_afp =NULL ; - }else if (whichfork ==XFS_COW_FORK ) { -kmem_cache_free (xfs_ifork_zone, ip->i_cowfp); - ip->i_cowfp =NULL ; +kmem_free (ifp->if_u1.if_data); + ifp->if_u1.if_data =NULL ; + }else if (ifp->if_flags &XFS_IFEXTENTS ) { +if (ifp->if_height) +xfs_iext_destroy (ifp); } }
fs/xfs/libxfs/xfs_inode_fork.h +1 -1
@@ -86,7 +86,7 @@ int xfs_iformat_data_fork(struct xfs_inode *, struct xfs_dinode *);int xfs_iformat_attr_fork (struct xfs_inode *,struct xfs_dinode *);void xfs_iflush_fork (struct xfs_inode *,struct xfs_dinode *,struct xfs_inode_log_item *,int ); -void xfs_idestroy_fork (struct xfs_inode *,int ); +void xfs_idestroy_fork (struct xfs_ifork *ifp);void xfs_idata_realloc (struct xfs_inode *ip,int64_t byte_diff,int whichfork);void xfs_iroot_realloc (struct xfs_inode *,int ,int );
fs/xfs/xfs_attr_inactive.c +5 -2
@@ -388,8 +388,11 @@ xfs_attr_inactive(xfs_trans_cancel (trans); out_destroy_fork:/* kill the in-core attr fork before we drop the inode lock */ -if (dp->i_afp) -xfs_idestroy_fork (dp,XFS_ATTR_FORK ); +if (dp->i_afp) { +xfs_idestroy_fork (dp->i_afp); +kmem_cache_free (xfs_ifork_zone, dp->i_afp); + dp->i_afp =NULL ; + }if (lock_mode)xfs_iunlock (dp, lock_mode);return error;
fs/xfs/xfs_icache.c +9 -6
@@ -87,15 +87,18 @@ xfs_inode_free_callback(case S_IFREG :case S_IFDIR :case S_IFLNK : -xfs_idestroy_fork (ip,XFS_DATA_FORK ); +xfs_idestroy_fork (&ip->i_df);break ; } -if (ip->i_afp) -xfs_idestroy_fork (ip,XFS_ATTR_FORK ); -if (ip->i_cowfp) -xfs_idestroy_fork (ip,XFS_COW_FORK ); - +if (ip->i_afp) { +xfs_idestroy_fork (ip->i_afp); +kmem_cache_free (xfs_ifork_zone, ip->i_afp); + } +if (ip->i_cowfp) { +xfs_idestroy_fork (ip->i_cowfp); +kmem_cache_free (xfs_ifork_zone, ip->i_cowfp); + }if (ip->i_itemp) {ASSERT (!test_bit (XFS_LI_IN_AIL , &ip->i_itemp->ili_item.li_flags));
Signature · 1 line
2.26.2
Re: [PATCH 6/6] xfs: cleanup xfs_idestroy_fork
Quoted 8 lines · Christoph Hellwig
Move freeing the dynamically allocated attr and COW fork, as well as zeroing the pointers where actually needed into the callers, and just pass the
xfs_iforkstructure toxfs_idestroy_fork. Also simplify thekmem_freecalls by not checking for NULL first.Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Chandan Babu R <[email protected]>---
Quoted 155 lines
fs/xfs/libxfs/xfs_attr_leaf.c | 7 +++---- fs/xfs/libxfs/xfs_inode_buf.c | 2 +- fs/xfs/libxfs/xfs_inode_fork.c | 32 +++++++++----------------------- fs/xfs/libxfs/xfs_inode_fork.h | 2 +- fs/xfs/xfs_attr_inactive.c | 7 +++++-- fs/xfs/xfs_icache.c | 15 +++++++++------ 6 files changed, 28 insertions(+), 37 deletions(-)fs/xfs/libxfs/xfs_attr_leaf.c +3
-4@@ -718,11 +718,10 @@ xfs_attr_fork_remove( {ASSERT (ip->i_afp->if_nextents ==0 ); -xfs_idestroy_fork (ip,XFS_ATTR_FORK ); +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 ; - -ASSERT (ip->i_afp ==NULL ); -xfs_trans_log_inode (tp, ip,XFS_ILOG_CORE ); }fs/xfs/libxfs/xfs_inode_buf.c +1
-1@@ -271,7 +271,7 @@ xfs_inode_from_disk(return 0 ; out_destroy_data_fork: -xfs_idestroy_fork (ip,XFS_DATA_FORK ); +xfs_idestroy_fork (&ip->i_df);return error; }fs/xfs/libxfs/xfs_inode_fork.c +9
-23@@ -503,38 +503,24 @@ xfs_idata_realloc(void xfs_idestroy_fork ( -xfs_inode_t *ip, -int whichfork) +struct xfs_ifork *ifp) { -struct xfs_ifork *ifp; - - ifp =XFS_IFORK_PTR (ip, whichfork);if (ifp->if_broot !=NULL ) {kmem_free (ifp->if_broot); ifp->if_broot =NULL ; }/* -* If the format is local, then we can't have an extents -* array so just look for an inline data array. If we're -* not local then we may or may not have an extents list, -* so check and free it up if we do. +* If the format is local, then we can't have an extents array so just +* look for an inline data array. If we're not local then we may or may +* not have an extents list, so check and free it up if we do. */ if (ifp->if_format ==XFS_DINODE_FMT_LOCAL ) { -if (ifp->if_u1.if_data !=NULL ) { -kmem_free (ifp->if_u1.if_data); - ifp->if_u1.if_data =NULL ; - } - }else if ((ifp->if_flags &XFS_IFEXTENTS ) && ifp->if_height) { -xfs_iext_destroy (ifp); - } - -if (whichfork ==XFS_ATTR_FORK ) { -kmem_cache_free (xfs_ifork_zone, ip->i_afp); - ip->i_afp =NULL ; - }else if (whichfork ==XFS_COW_FORK ) { -kmem_cache_free (xfs_ifork_zone, ip->i_cowfp); - ip->i_cowfp =NULL ; +kmem_free (ifp->if_u1.if_data); + ifp->if_u1.if_data =NULL ; + }else if (ifp->if_flags &XFS_IFEXTENTS ) { +if (ifp->if_height) +xfs_iext_destroy (ifp); } }fs/xfs/libxfs/xfs_inode_fork.h +1
-1@@ -86,7 +86,7 @@ int xfs_iformat_data_fork(struct xfs_inode *, struct xfs_dinode *);int xfs_iformat_attr_fork (struct xfs_inode *,struct xfs_dinode *);void xfs_iflush_fork (struct xfs_inode *,struct xfs_dinode *,struct xfs_inode_log_item *,int ); -void xfs_idestroy_fork (struct xfs_inode *,int ); +void xfs_idestroy_fork (struct xfs_ifork *ifp);void xfs_idata_realloc (struct xfs_inode *ip,int64_t byte_diff,int whichfork);void xfs_iroot_realloc (struct xfs_inode *,int ,int );fs/xfs/xfs_attr_inactive.c +5
-2@@ -388,8 +388,11 @@ xfs_attr_inactive(xfs_trans_cancel (trans); out_destroy_fork:/* kill the in-core attr fork before we drop the inode lock */ -if (dp->i_afp) -xfs_idestroy_fork (dp,XFS_ATTR_FORK ); +if (dp->i_afp) { +xfs_idestroy_fork (dp->i_afp); +kmem_cache_free (xfs_ifork_zone, dp->i_afp); + dp->i_afp =NULL ; + }if (lock_mode)xfs_iunlock (dp, lock_mode);return error;fs/xfs/xfs_icache.c +9
-6@@ -87,15 +87,18 @@ xfs_inode_free_callback(case S_IFREG :case S_IFDIR :case S_IFLNK : -xfs_idestroy_fork (ip,XFS_DATA_FORK ); +xfs_idestroy_fork (&ip->i_df);break ; } -if (ip->i_afp) -xfs_idestroy_fork (ip,XFS_ATTR_FORK ); -if (ip->i_cowfp) -xfs_idestroy_fork (ip,XFS_COW_FORK ); - +if (ip->i_afp) { +xfs_idestroy_fork (ip->i_afp); +kmem_cache_free (xfs_ifork_zone, ip->i_afp); + } +if (ip->i_cowfp) { +xfs_idestroy_fork (ip->i_cowfp); +kmem_cache_free (xfs_ifork_zone, ip->i_cowfp); + }if (ip->i_itemp) {ASSERT (!test_bit (XFS_LI_IN_AIL , &ip->i_itemp->ili_item.li_flags));Signature · 1 line
2.26.2