xfs inode structure cleanups v4
Hi all,
This series cleans up how we define struct xfs_inode. Most importantly it removes the pointles xfs_icdinode sub-structure.
Changes since v3:
- rebased to the latest for-next tree
- fix v4 file system handling in xfs_ioctl_setattr
- rename XFS_IDMAPI to XFS_IPRESERVE_DM_FIELDS
- two additional cleanup patches
- minor typo fixes
Changes since v2:
- rebased to 5.12-rc
- remove the legacy DMAPI fields entirely
- ensure freshly allocated inodes have diflags2 cleared
Changes since v1:
- rebased to 5.8-rc
- use xfs_extlen_t fo i_cowextsize
- cleanup xfs_fill_fsxattr
PATCH 1/20 xfs: split xfs_imap_to_bp
Split looking up the dinode from xfs_imap_to_bp, which can be significantly simplified as a result.
--- fs/xfs/libxfs/xfs_inode_buf.c | 27 ++++----------------------- fs/xfs/libxfs/xfs_inode_buf.h | 5 ++--- fs/xfs/libxfs/xfs_trans_inode.c | 3 +-- fs/xfs/scrub/ialloc.c | 3 +-- fs/xfs/xfs_icache.c | 6 +++--- fs/xfs/xfs_inode.c | 6 ++++-- fs/xfs/xfs_log_recover.c | 3 ++- 7 files changed, 17 insertions(+), 36 deletions(-)
fs/xfs/libxfs/xfs_inode_buf.c +4 -23
@@ -124,37 +124,18 @@ const struct xfs_buf_ops xfs_inode_buf_ra_ops = {/* * This routine is called to map an inode to the buffer containing the on-disk * version of the inode. It returns a pointer to the buffer containing the -* on-disk inode in the bpp parameter, and in the dipp parameter it returns a -* pointer to the on-disk inode within that buffer. -* -* If a non-zero error is returned, then the contents of bpp and dipp are -* undefined. +* on-disk inode in the bpp parameter. */ int xfs_imap_to_bp (struct xfs_mount *mp,struct xfs_trans *tp,struct xfs_imap *imap, -struct xfs_dinode **dipp, -struct xfs_buf **bpp, -uint buf_flags) +struct xfs_buf **bpp) { -struct xfs_buf *bp; -int error; - - buf_flags |=XBF_UNMAPPED ; - error =xfs_trans_read_buf (mp, tp, mp->m_ddev_targp, imap->im_blkno, - (int )imap->im_len, buf_flags, &bp, +return xfs_trans_read_buf (mp, tp, mp->m_ddev_targp, imap->im_blkno, + imap->im_len,XBF_UNMAPPED , bpp, &xfs_inode_buf_ops); -if (error) { -ASSERT (error != -EAGAIN || (buf_flags &XBF_TRYLOCK )); -return error; - } - - *bpp = bp; -if (dipp) - *dipp =xfs_buf_offset (bp, imap->im_boffset); -return 0 ; }static inline struct timespec64 xfs_inode_decode_bigtime (uint64_t ts)
fs/xfs/libxfs/xfs_inode_buf.h +2 -3
@@ -47,9 +47,8 @@ struct xfs_imap {unsigned short im_boffset;/* inode offset in block in bytes */ }; -int xfs_imap_to_bp (struct xfs_mount *,struct xfs_trans *, -struct xfs_imap *,struct xfs_dinode **, -struct xfs_buf **,uint ); +int xfs_imap_to_bp (struct xfs_mount *mp,struct xfs_trans *tp, +struct xfs_imap *imap,struct xfs_buf **bpp);void xfs_dinode_calc_crc (struct xfs_mount *,struct xfs_dinode *);void xfs_inode_to_disk (struct xfs_inode *ip,struct xfs_dinode *to,xfs_lsn_t lsn);
fs/xfs/libxfs/xfs_trans_inode.c +1 -2
@@ -164,8 +164,7 @@ xfs_trans_log_inode(* here. */ spin_unlock (&iip->ili_lock); - error =xfs_imap_to_bp (ip->i_mount, tp, &ip->i_imap,NULL , - &bp,0 ); + error =xfs_imap_to_bp (ip->i_mount, tp, &ip->i_imap, &bp);if (error) {xfs_force_shutdown (ip->i_mount,SHUTDOWN_META_IO_ERROR );return ;
fs/xfs/scrub/ialloc.c +1 -2
@@ -212,7 +212,6 @@ xchk_iallocbt_check_cluster( {struct xfs_imap imap;struct xfs_mount *mp = bs->cur->bc_mp; -struct xfs_dinode *dip;struct xfs_buf *cluster_bp;unsigned int nr_inodes;xfs_agnumber_t agno = bs->cur->bc_ag.agno;
@@ -278,7 +277,7 @@ xchk_iallocbt_check_cluster( &XFS_RMAP_OINFO_INODES);/* Grab the inode cluster buffer. */ - error =xfs_imap_to_bp (mp, bs->cur->bc_tp, &imap, &dip, &cluster_bp,0 ); + error =xfs_imap_to_bp (mp, bs->cur->bc_tp, &imap, &cluster_bp);if (!xchk_btree_xref_process_error (bs->sc, bs->cur,0 , &error))return error;
fs/xfs/xfs_icache.c +3 -3
@@ -505,14 +505,14 @@ xfs_iget_cache_miss( (flags & XFS_IGET_CREATE) && !(mp->m_flags & XFS_MOUNT_IKEEP)) { VFS_I(ip)->i_generation = prandom_u32(); } else { -struct xfs_dinode *dip;struct xfs_buf *bp; - error =xfs_imap_to_bp (mp, tp, &ip->i_imap, &dip, &bp,0 ); + error =xfs_imap_to_bp (mp, tp, &ip->i_imap, &bp);if (error) goto out_destroy; - error =xfs_inode_from_disk (ip, dip); + error =xfs_inode_from_disk (ip, +xfs_buf_offset (bp, ip->i_imap.im_boffset));if (!error)xfs_buf_set_ref (bp,XFS_INO_REF );xfs_trans_brelse (tp, bp);
fs/xfs/xfs_inode.c +4 -2
@@ -2075,9 +2075,10 @@ xfs_iunlink_update_inode(ASSERT (xfs_verify_agino_or_null (mp, agno, next_agino)); - error =xfs_imap_to_bp (mp, tp, &ip->i_imap, &dip, &ibp,0 ); + error =xfs_imap_to_bp (mp, tp, &ip->i_imap, &ibp);if (error)return error; + dip =xfs_buf_offset (ibp, ip->i_imap.im_boffset);/* Make sure the old pointer isn't garbage. */ old_value =be32_to_cpu (dip->di_next_unlinked);
@@ -2202,13 +2203,14 @@ xfs_iunlink_map_ino(return error; } - error =xfs_imap_to_bp (mp, tp, imap, dipp, bpp,0 ); + error =xfs_imap_to_bp (mp, tp, imap, bpp);if (error) {xfs_warn (mp,"%s: xfs_imap_to_bp returned error %d." , __func__, error);return error; } + *dipp =xfs_buf_offset (*bpp, imap->im_boffset);return 0 ; }
fs/xfs/xfs_log_recover.c +2 -1
@@ -2683,9 +2683,10 @@ xlog_recover_process_one_iunlink(/* * Get the on disk inode to find the next inode in the bucket. */ - error =xfs_imap_to_bp (mp,NULL , &ip->i_imap, &dip, &ibp,0 ); + error =xfs_imap_to_bp (mp,NULL , &ip->i_imap, &ibp);if (error) goto fail_iput; + dip =xfs_buf_offset (ibp, ip->i_imap.im_boffset);xfs_iflags_clear (ip,XFS_IRECOVERY );ASSERT (VFS_I (ip)->i_nlink ==0 );
Signature · 1 line
2.30.1
PATCH 2/20 xfs: consistently initialize di_flags2
In reply to Christoph HellwigMake sure di_flags2 is always initialized. We currently get this implicitly by clearing the dinode core on allocating the in-core inode, but that is about to go away.
--- fs/xfs/xfs_icache.c | 1 + fs/xfs/xfs_inode.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)
fs/xfs/xfs_icache.c +1 -0
@@ -64,6 +64,7 @@ xfs_inode_alloc( ip->i_flags =0 ; ip->i_delayed_blks =0 ;memset (&ip->i_d,0 ,sizeof (ip->i_d)); + ip->i_d.di_flags2 = mp->m_ino_geo.new_diflags2; ip->i_sick =0 ; ip->i_checked =0 ;INIT_WORK (&ip->i_ioend_work, xfs_end_io);
fs/xfs/xfs_inode.c +0 -1
@@ -846,7 +846,6 @@ xfs_init_new_inode(if (xfs_sb_version_has_v3inode (&mp->m_sb)) {inode_set_iversion (inode,1 ); - ip->i_d.di_flags2 = mp->m_ino_geo.new_diflags2; ip->i_d.di_cowextsize =0 ; ip->i_d.di_crtime = tv; }
Signature · 1 line
2.30.1
PATCH 3/20 xfs: handle crtime more carefully in xfs_bulkstat_one_int
In reply to Christoph HellwigThe crtime only exists for v5 inodes, so only copy it for those.
--- fs/xfs/xfs_itable.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/xfs/xfs_itable.c +2 -2
@@ -99,8 +99,6 @@ xfs_bulkstat_one_int( buf->bs_mtime_nsec = inode->i_mtime.tv_nsec; buf->bs_ctime = inode->i_ctime.tv_sec; buf->bs_ctime_nsec = inode->i_ctime.tv_nsec; - buf->bs_btime = dic->di_crtime.tv_sec; - buf->bs_btime_nsec = dic->di_crtime.tv_nsec; buf->bs_gen = inode->i_generation; buf->bs_mode = inode->i_mode;
@@ -113,6 +111,8 @@ xfs_bulkstat_one_int( buf->bs_version =XFS_BULKSTAT_VERSION_V5 ;if (xfs_sb_version_has_v3inode (&mp->m_sb)) { + buf->bs_btime = dic->di_crtime.tv_sec; + buf->bs_btime_nsec = dic->di_crtime.tv_nsec;if (dic->di_flags2 &XFS_DIFLAG2_COWEXTSIZE ) buf->bs_cowextsize_blks = dic->di_cowextsize; }
Signature · 1 line
2.30.1
PATCH 4/20 xfs: remove the unused xfs_icdinode_has_bigtime helper
In reply to Christoph Hellwig--- fs/xfs/libxfs/xfs_inode_buf.h | 5 ----- 1 file changed, 5 deletions(-)
fs/xfs/libxfs/xfs_inode_buf.h +0 -5
@@ -32,11 +32,6 @@ struct xfs_icdinode {struct timespec64 di_crtime;/* time created */ }; -static inline bool xfs_icdinode_has_bigtime (const struct xfs_icdinode *icd) -{ -return icd->di_flags2 &XFS_DIFLAG2_BIGTIME ; -} -/* * Inode location information. Stored in the inode and passed to * xfs_imap_to_bp() to get a buffer and dinode for a given inode.
Signature · 1 line
2.30.1
PATCH 5/20 xfs: remove the di_dmevmask and di_dmstate fields from struct xfs_icdinode
In reply to Christoph HellwigThe legacy DMAPI fields were never set by upstream Linux XFS, and have no way to be read using the kernel APIs. So instead of bloating the in-core inode for them just copy them from the on-disk inode into the log when logging the inode. The only caveat is that we need to make sure to zero the fields for newly read or deleted inodes, which is solved using a new flag in the inode.
--- fs/xfs/libxfs/xfs_inode_buf.c | 7 +++---- fs/xfs/libxfs/xfs_inode_buf.h | 2 -- fs/xfs/xfs_inode.c | 5 ++--- fs/xfs/xfs_inode.h | 1 + fs/xfs/xfs_inode_item.c | 31 +++++++++++++++++++++++++++++-- fs/xfs/xfs_log_recover.c | 6 ------ 6 files changed, 35 insertions(+), 17 deletions(-)
fs/xfs/libxfs/xfs_inode_buf.c +3 -4
@@ -230,10 +230,11 @@ 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_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); +if (from->di_dmevmask || from->di_dmstate) +xfs_iflags_set (ip,XFS_IPRESERVE_DM_FIELDS ); +if (xfs_sb_version_has_v3inode (&ip->i_mount->m_sb)) {inode_set_iversion_queried (inode,be64_to_cpu (from->di_changecount));
@@ -311,8 +312,6 @@ xfs_inode_to_disk( to->di_anextents =cpu_to_be16 (xfs_ifork_nextents (ip->i_afp)); to->di_forkoff = from->di_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); to->di_flags =cpu_to_be16 (from->di_flags);if (xfs_sb_version_has_v3inode (&ip->i_mount->m_sb)) {
fs/xfs/libxfs/xfs_inode_buf.h +0 -2
@@ -22,8 +22,6 @@ struct xfs_icdinode {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 */ -uint32_t di_dmevmask;/* DMIG event mask */ -uint16_t di_dmstate;/* DMIG state info */ uint16_t di_flags;/* random flags, XFS_DIFLAG_... */ uint64_t di_flags2;/* more random flags */
fs/xfs/xfs_inode.c +2 -3
@@ -840,8 +840,6 @@ xfs_init_new_inode( inode->i_ctime = tv; ip->i_d.di_extsize =0 ; - ip->i_d.di_dmevmask =0 ; - ip->i_d.di_dmstate =0 ; ip->i_d.di_flags =0 ;if (xfs_sb_version_has_v3inode (&mp->m_sb)) {
@@ -2615,9 +2613,10 @@ xfs_ifree(VFS_I (ip)->i_mode =0 ;/* mark incore inode as free */ ip->i_d.di_flags =0 ; ip->i_d.di_flags2 = ip->i_mount->m_ino_geo.new_diflags2; - ip->i_d.di_dmevmask =0 ; ip->i_d.di_forkoff =0 ;/* mark the attr fork not in use */ ip->i_df.if_format =XFS_DINODE_FMT_EXTENTS ; +if (xfs_iflags_test (ip,XFS_IPRESERVE_DM_FIELDS )) +xfs_iflags_clear (ip,XFS_IPRESERVE_DM_FIELDS );/* Don't attempt to replay owner changes for a deleted inode */ spin_lock (&iip->ili_lock);
fs/xfs/xfs_inode.h +1 -0
@@ -220,6 +220,7 @@ static inline bool xfs_inode_has_bigtime(struct xfs_inode *ip)#define XFS_IRECLAIM (1 << 0)/* started reclaiming this inode */ #define XFS_ISTALE (1 << 1)/* inode has been staled */ #define XFS_IRECLAIMABLE (1 << 2)/* inode can be reclaimed */ +#define XFS_IPRESERVE_DM_FIELDS (1 << 4)/* has legacy DMAPI fields set */ #define __XFS_INEW_BIT 3/* inode has just been allocated */ #define XFS_INEW (1 << __XFS_INEW_BIT)#define XFS_ITRUNCATED (1 << 5)/* truncated down so flush-on-close */
fs/xfs/xfs_inode_item.c +29 -2
@@ -317,6 +317,33 @@ xfs_inode_to_log_dinode_ts(return its; } +/* +* The legacy DMAPI fields are only present in the on-disk and in-log inodes, +* but not in the in-memory one. But we are guaranteed to have an inode buffer +* in memory when logging an inode, so we can just copy it from the on-disk +* inode to the in-log inode here so that recovery of file system with these +* fields set to non-zero values doesn't lose them. For all other cases we zero +* the fields. +*/ +static void +xfs_copy_dm_fields_to_log_dinode ( +struct xfs_inode *ip, +struct xfs_log_dinode *to) +{ +struct xfs_dinode *dip; + + dip =xfs_buf_offset (ip->i_itemp->ili_item.li_buf, + ip->i_imap.im_boffset); + +if (xfs_iflags_test (ip,XFS_IPRESERVE_DM_FIELDS )) { + to->di_dmevmask =be32_to_cpu (dip->di_dmevmask); + to->di_dmstate =be16_to_cpu (dip->di_dmstate); + }else { + to->di_dmevmask =0 ; + to->di_dmstate =0 ; + } +} + static void xfs_inode_to_log_dinode( struct xfs_inode *ip,
@@ -349,10 +376,10 @@ xfs_inode_to_log_dinode( to->di_anextents =xfs_ifork_nextents (ip->i_afp); to->di_forkoff = from->di_forkoff; 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; +xfs_copy_dm_fields_to_log_dinode (ip, to); +/* log a dummy value to ensure log structure is fully initialised */ to->di_next_unlinked =NULLAGINO ;
fs/xfs/xfs_log_recover.c +0 -6
@@ -2696,12 +2696,6 @@ xlog_recover_process_one_iunlink( agino =be32_to_cpu (dip->di_next_unlinked);xfs_buf_relse (ibp); -/* -* Prevent any DMAPI event from being sent when the reference on -* the inode is dropped. -*/ - ip->i_d.di_dmevmask =0 ; -xfs_irele (ip);return agino;
Signature · 1 line
2.30.1
Re: [PATCH 05/20] xfs: remove the di_dmevmask and di_dmstate fields from struct xfs_icdinode
Quoted 8 lines · Christoph Hellwig
The legacy DMAPI fields were never set by upstream Linux XFS, and have no way to be read using the kernel APIs. So instead of bloating the in-core inode for them just copy them from the on-disk inode into the log when logging the inode. The only caveat is that we need to make sure to zero the fields for newly read or deleted inodes, which is solved using a new flag in the inode.
Signed-off-by Christoph Hellwig <[email protected]>
Do you want to put dmevmask/dmstate preservation on the deprecated list too, seeing as the only (out of tree) user wrote in on the last submission to say that they're not supporting it past 2022 and have never supported mounting those XFSes with upstream kernels?
Granted, the difficulty there is how do you deprecate something that isn't there? 8)
Anyway this series got through the first and second rounds of fstesting so I guess it's good to go.
--D
Quoted 157 lines
--- fs/xfs/libxfs/xfs_inode_buf.c | 7 +++---- fs/xfs/libxfs/xfs_inode_buf.h | 2 -- fs/xfs/xfs_inode.c | 5 ++--- fs/xfs/xfs_inode.h | 1 + fs/xfs/xfs_inode_item.c | 31 +++++++++++++++++++++++++++++-- fs/xfs/xfs_log_recover.c | 6 ------ 6 files changed, 35 insertions(+), 17 deletions(-)fs/xfs/libxfs/xfs_inode_buf.c +3
-4@@ -230,10 +230,11 @@ 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_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); +if (from->di_dmevmask || from->di_dmstate) +xfs_iflags_set (ip,XFS_IPRESERVE_DM_FIELDS ); +if (xfs_sb_version_has_v3inode (&ip->i_mount->m_sb)) {inode_set_iversion_queried (inode,be64_to_cpu (from->di_changecount));@@ -311,8 +312,6 @@ xfs_inode_to_disk( to->di_anextents =cpu_to_be16 (xfs_ifork_nextents (ip->i_afp)); to->di_forkoff = from->di_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); to->di_flags =cpu_to_be16 (from->di_flags);if (xfs_sb_version_has_v3inode (&ip->i_mount->m_sb)) {fs/xfs/libxfs/xfs_inode_buf.h +0
-2@@ -22,8 +22,6 @@ struct xfs_icdinode {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 */ -uint32_t di_dmevmask;/* DMIG event mask */ -uint16_t di_dmstate;/* DMIG state info */ uint16_t di_flags;/* random flags, XFS_DIFLAG_... */ uint64_t di_flags2;/* more random flags */ fs/xfs/xfs_inode.c +2
-3@@ -840,8 +840,6 @@ xfs_init_new_inode( inode->i_ctime = tv; ip->i_d.di_extsize =0 ; - ip->i_d.di_dmevmask =0 ; - ip->i_d.di_dmstate =0 ; ip->i_d.di_flags =0 ;if (xfs_sb_version_has_v3inode (&mp->m_sb)) {@@ -2615,9 +2613,10 @@ xfs_ifree(VFS_I (ip)->i_mode =0 ;/* mark incore inode as free */ ip->i_d.di_flags =0 ; ip->i_d.di_flags2 = ip->i_mount->m_ino_geo.new_diflags2; - ip->i_d.di_dmevmask =0 ; ip->i_d.di_forkoff =0 ;/* mark the attr fork not in use */ ip->i_df.if_format =XFS_DINODE_FMT_EXTENTS ; +if (xfs_iflags_test (ip,XFS_IPRESERVE_DM_FIELDS )) +xfs_iflags_clear (ip,XFS_IPRESERVE_DM_FIELDS );/* Don't attempt to replay owner changes for a deleted inode */ spin_lock (&iip->ili_lock);fs/xfs/xfs_inode.h +1
-0@@ -220,6 +220,7 @@ static inline bool xfs_inode_has_bigtime(struct xfs_inode *ip)#define XFS_IRECLAIM (1 << 0)/* started reclaiming this inode */ #define XFS_ISTALE (1 << 1)/* inode has been staled */ #define XFS_IRECLAIMABLE (1 << 2)/* inode can be reclaimed */ +#define XFS_IPRESERVE_DM_FIELDS (1 << 4)/* has legacy DMAPI fields set */ #define __XFS_INEW_BIT 3/* inode has just been allocated */ #define XFS_INEW (1 << __XFS_INEW_BIT)#define XFS_ITRUNCATED (1 << 5)/* truncated down so flush-on-close */ fs/xfs/xfs_inode_item.c +29
-2@@ -317,6 +317,33 @@ xfs_inode_to_log_dinode_ts(return its; } +/* +* The legacy DMAPI fields are only present in the on-disk and in-log inodes, +* but not in the in-memory one. But we are guaranteed to have an inode buffer +* in memory when logging an inode, so we can just copy it from the on-disk +* inode to the in-log inode here so that recovery of file system with these +* fields set to non-zero values doesn't lose them. For all other cases we zero +* the fields. +*/ +static void +xfs_copy_dm_fields_to_log_dinode ( +struct xfs_inode *ip, +struct xfs_log_dinode *to) +{ +struct xfs_dinode *dip; + + dip =xfs_buf_offset (ip->i_itemp->ili_item.li_buf, + ip->i_imap.im_boffset); + +if (xfs_iflags_test (ip,XFS_IPRESERVE_DM_FIELDS )) { + to->di_dmevmask =be32_to_cpu (dip->di_dmevmask); + to->di_dmstate =be16_to_cpu (dip->di_dmstate); + }else { + to->di_dmevmask =0 ; + to->di_dmstate =0 ; + } +} + static void xfs_inode_to_log_dinode( struct xfs_inode *ip,@@ -349,10 +376,10 @@ xfs_inode_to_log_dinode( to->di_anextents =xfs_ifork_nextents (ip->i_afp); to->di_forkoff = from->di_forkoff; 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; +xfs_copy_dm_fields_to_log_dinode (ip, to); +/* log a dummy value to ensure log structure is fully initialised */ to->di_next_unlinked =NULLAGINO ;fs/xfs/xfs_log_recover.c +0
-6@@ -2696,12 +2696,6 @@ xlog_recover_process_one_iunlink( agino =be32_to_cpu (dip->di_next_unlinked);xfs_buf_relse (ibp); -/* -* Prevent any DMAPI event from being sent when the reference on -* the inode is dropped. -*/ - ip->i_d.di_dmevmask =0 ; -xfs_irele (ip);return agino;Signature · 1 line
2.30.1
Re: [PATCH 05/20] xfs: remove the di_dmevmask and di_dmstate fields from struct xfs_icdinode
Quoted 7 lines · Darrick J. Wong
Do you want to put dmevmask/dmstate preservation on the deprecated list too, seeing as the only (out of tree) user wrote in on the last submission to say that they're not supporting it past 2022 and have never supported mounting those XFSes with upstream kernels?
Granted, the difficulty there is how do you deprecate something that isn't there? 8)
Yeah. I'm not sure what to really do about this. In practice I suspect v5 file systems with these flags simply do not exist. The cost to maintain the flag is pretty low, so I'm not sure the deprecation is that important. I'd rather just reuse the flags next time we add a new incompat feature that needs them, at which point we have our normal feature mechanism take care of it.
PATCH 6/20 xfs: don't clear the "dinode core" in xfs_inode_alloc
In reply to Christoph HellwigThe xfs_icdinode structure just contains a random mix of inode field, which are all read from the on-disk inode and mostly not looked at before reading the inode or initializing a new inode cluster. The only exceptions are the forkoff and blocks field, which are used in sanity checks for freshly allocated inodes.
--- fs/xfs/xfs_icache.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/xfs/xfs_icache.c +2 -1
@@ -63,8 +63,9 @@ xfs_inode_alloc(memset (&ip->i_df,0 ,sizeof (ip->i_df)); ip->i_flags =0 ; ip->i_delayed_blks =0 ; -memset (&ip->i_d,0 ,sizeof (ip->i_d)); ip->i_d.di_flags2 = mp->m_ino_geo.new_diflags2; + ip->i_d.di_nblocks =0 ; + ip->i_d.di_forkoff =0 ; ip->i_sick =0 ; ip->i_checked =0 ;INIT_WORK (&ip->i_ioend_work, xfs_end_io);
Signature · 1 line
2.30.1
PATCH 7/20 xfs: move the di_projid field to struct xfs_inode
In reply to Christoph HellwigIn preparation of removing the historic icinode struct, move the projid field into the containing xfs_inode structure.
--- fs/xfs/libxfs/xfs_inode_buf.c | 8 ++++---- fs/xfs/libxfs/xfs_inode_buf.h | 1 - fs/xfs/xfs_bmap_util.c | 2 +- fs/xfs/xfs_dquot.c | 2 +- fs/xfs/xfs_icache.c | 4 ++-- fs/xfs/xfs_inode.c | 6 +++--- fs/xfs/xfs_inode.h | 3 ++- fs/xfs/xfs_inode_item.c | 4 ++-- fs/xfs/xfs_ioctl.c | 6 +++--- fs/xfs/xfs_iops.c | 2 +- fs/xfs/xfs_itable.c | 2 +- fs/xfs/xfs_qm.c | 4 ++-- fs/xfs/xfs_qm_bhv.c | 2 +- 13 files changed, 23 insertions(+), 23 deletions(-)
fs/xfs/libxfs/xfs_inode_buf.c +4 -4
@@ -206,10 +206,10 @@ xfs_inode_from_disk(*/ if (unlikely (from->di_version ==1 )) {set_nlink (inode,be16_to_cpu (from->di_onlink)); - to->di_projid =0 ; + ip->i_projid =0 ; }else {set_nlink (inode,be32_to_cpu (from->di_nlink)); - to->di_projid = (prid_t )be16_to_cpu (from->di_projid_hi) <<16 | + ip->i_projid = (prid_t )be16_to_cpu (from->di_projid_hi) <<16 |be16_to_cpu (from->di_projid_lo); }
@@ -294,8 +294,8 @@ xfs_inode_to_disk( 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 ); - to->di_projid_hi =cpu_to_be16 (from->di_projid >>16 ); + to->di_projid_lo =cpu_to_be16 (ip->i_projid &0xffff ); + to->di_projid_hi =cpu_to_be16 (ip->i_projid >>16 );memset (to->di_pad,0 ,sizeof (to->di_pad)); to->di_atime =xfs_inode_to_disk_ts (ip, inode->i_atime);
fs/xfs/libxfs/xfs_inode_buf.h +0 -1
@@ -17,7 +17,6 @@ struct xfs_dinode;*/ struct xfs_icdinode {uint16_t di_flushiter;/* incremented on flush */ -prid_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 */
fs/xfs/xfs_bmap_util.c +1 -1
@@ -1208,7 +1208,7 @@ xfs_swap_extents_check_format(if (XFS_IS_QUOTA_ON (ip->i_mount) && (!uid_eq (VFS_I (ip)->i_uid,VFS_I (tip)->i_uid) || !gid_eq (VFS_I (ip)->i_gid,VFS_I (tip)->i_gid) || - ip->i_d.di_projid != tip->i_d.di_projid)) + ip->i_projid != tip->i_projid))return -EINVAL ;/* Should never get a local format */
fs/xfs/xfs_dquot.c +1 -1
@@ -953,7 +953,7 @@ xfs_qm_id_for_quotatype(case XFS_DQTYPE_GROUP :return i_gid_read (VFS_I (ip));case XFS_DQTYPE_PROJ : -return ip->i_d.di_projid; +return ip->i_projid; }ASSERT (0 );return 0 ;
fs/xfs/xfs_icache.c +2 -2
@@ -1204,7 +1204,7 @@ xfs_inode_match_id(return false;if ((eofb->eof_flags &XFS_EOF_FLAGS_PRID ) && - ip->i_d.di_projid != eofb->eof_prid) + ip->i_projid != eofb->eof_prid)return false;return true;
@@ -1228,7 +1228,7 @@ xfs_inode_match_id_union(return true;if ((eofb->eof_flags &XFS_EOF_FLAGS_PRID ) && - ip->i_d.di_projid == eofb->eof_prid) + ip->i_projid == eofb->eof_prid)return true;return false;
fs/xfs/xfs_inode.c +3 -3
@@ -809,7 +809,7 @@ xfs_init_new_inode( inode =VFS_I (ip);set_nlink (inode, nlink); inode->i_rdev = rdev; - ip->i_d.di_projid = prid; + ip->i_projid = prid;if (dir && !(dir->i_mode &S_ISGID ) && (mp->m_flags &XFS_MOUNT_GRPID )) {
@@ -1288,7 +1288,7 @@ xfs_link(* the tree quota mechanism could be circumvented. */ if (unlikely ((tdp->i_d.di_flags &XFS_DIFLAG_PROJINHERIT ) && - tdp->i_d.di_projid != sip->i_d.di_projid)) { + tdp->i_projid != sip->i_projid)) { error = -EXDEV ; goto error_return; }
@@ -3126,7 +3126,7 @@ xfs_rename(* tree quota mechanism would be circumvented. */ if (unlikely ((target_dp->i_d.di_flags &XFS_DIFLAG_PROJINHERIT ) && - target_dp->i_d.di_projid != src_ip->i_d.di_projid)) { + target_dp->i_projid != src_ip->i_projid)) { error = -EXDEV ; goto out_trans_cancel; }
fs/xfs/xfs_inode.h +2 -1
@@ -54,6 +54,7 @@ typedef struct xfs_inode {/* Miscellaneous state. */ unsigned long i_flags;/* see defined flags below */ uint64_t i_delayed_blks;/* count of delay alloc blks */ +prid_t i_projid;/* owner's project id */ struct xfs_icdinode i_d;/* most of ondisk inode */
@@ -175,7 +176,7 @@ static inline prid_t xfs_get_initial_prid(struct xfs_inode *dp) {if (dp->i_d.di_flags &XFS_DIFLAG_PROJINHERIT ) -return dp->i_d.di_projid; +return dp->i_projid;return XFS_PROJID_DEFAULT ; }
fs/xfs/xfs_inode_item.c +2 -2
@@ -357,8 +357,8 @@ xfs_inode_to_log_dinode( 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 ; - to->di_projid_hi = from->di_projid >>16 ; + to->di_projid_lo = ip->i_projid &0xffff ; + to->di_projid_hi = ip->i_projid >>16 ;memset (to->di_pad,0 ,sizeof (to->di_pad));memset (to->di_pad3,0 ,sizeof (to->di_pad3));
fs/xfs/xfs_ioctl.c +3 -3
@@ -1123,7 +1123,7 @@ xfs_fill_fsxattr( 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; + fa->fsx_projid = ip->i_projid;if (ifp && (ifp->if_flags &XFS_IFEXTENTS )) fa->fsx_nextents =xfs_iext_count (ifp);else
@@ -1505,12 +1505,12 @@ xfs_ioctl_setattr(VFS_I (ip)->i_mode &= ~(S_ISUID |S_ISGID );/* Change the ownerships and register project quota modifications */ -if (ip->i_d.di_projid != fa->fsx_projid) { +if (ip->i_projid != fa->fsx_projid) {if (XFS_IS_QUOTA_RUNNING (mp) &&XFS_IS_PQUOTA_ON (mp)) { olddquot =xfs_qm_vop_chown (tp, ip, &ip->i_pdquot, pdqp); } - ip->i_d.di_projid = fa->fsx_projid; + ip->i_projid = fa->fsx_projid; }/*
fs/xfs/xfs_iops.c +1 -1
@@ -737,7 +737,7 @@ xfs_setattr_nonsize(*/ ASSERT (udqp ==NULL );ASSERT (gdqp ==NULL ); - error =xfs_qm_vop_dqalloc (ip, uid, gid, ip->i_d.di_projid, + error =xfs_qm_vop_dqalloc (ip, uid, gid, ip->i_projid, qflags, &udqp, &gdqp,NULL );if (error)return error;
fs/xfs/xfs_itable.c +1 -1
@@ -86,7 +86,7 @@ xfs_bulkstat_one_int(/* xfs_iget returns the following without needing * further change. */ - buf->bs_projectid = ip->i_d.di_projid; + buf->bs_projectid = ip->i_projid; buf->bs_ino = ino; buf->bs_uid =from_kuid (sb_userns,i_uid_into_mnt (mnt_userns, inode)); buf->bs_gid =from_kgid (sb_userns,i_gid_into_mnt (mnt_userns, inode));
fs/xfs/xfs_qm.c +2 -2
@@ -1716,7 +1716,7 @@ xfs_qm_vop_dqalloc( }if ((flags &XFS_QMOPT_PQUOTA ) &&XFS_IS_PQUOTA_ON (mp)) {ASSERT (O_pdqpp); -if (ip->i_d.di_projid != prid) { +if (ip->i_projid != prid) {xfs_iunlock (ip, lockflags); error =xfs_qm_dqget (mp, prid,XFS_DQTYPE_PROJ , true, &pq);
@@ -1877,7 +1877,7 @@ xfs_qm_vop_create_dqattach( }if (pdqp &&XFS_IS_PQUOTA_ON (mp)) {ASSERT (ip->i_pdquot ==NULL ); -ASSERT (ip->i_d.di_projid == pdqp->q_id); +ASSERT (ip->i_projid == pdqp->q_id); ip->i_pdquot =xfs_qm_dqhold (pdqp);xfs_trans_mod_dquot (tp, pdqp,XFS_TRANS_DQ_ICOUNT ,1 );
fs/xfs/xfs_qm_bhv.c +1 -1
@@ -60,7 +60,7 @@ xfs_qm_statvfs(struct xfs_mount *mp = ip->i_mount;struct xfs_dquot *dqp; -if (!xfs_qm_dqget (mp, ip->i_d.di_projid,XFS_DQTYPE_PROJ , false, &dqp)) { +if (!xfs_qm_dqget (mp, ip->i_projid,XFS_DQTYPE_PROJ , false, &dqp)) {xfs_fill_statvfs_from_dquot (statp, dqp);xfs_qm_dqput (dqp); }
Signature · 1 line
2.30.1
Re: [PATCH 07/20] xfs: move the di_projid field to struct xfs_inode
Quoted 4 lines · Christoph Hellwig
In preparation of removing the historic icinode struct, move the projid field into the containing
xfs_inodestructure.Signed-off-by Christoph Hellwig <[email protected]>
Looks good now, thanks,
--D
Quoted 263 lines
--- fs/xfs/libxfs/xfs_inode_buf.c | 8 ++++---- fs/xfs/libxfs/xfs_inode_buf.h | 1 - fs/xfs/xfs_bmap_util.c | 2 +- fs/xfs/xfs_dquot.c | 2 +- fs/xfs/xfs_icache.c | 4 ++-- fs/xfs/xfs_inode.c | 6 +++--- fs/xfs/xfs_inode.h | 3 ++- fs/xfs/xfs_inode_item.c | 4 ++-- fs/xfs/xfs_ioctl.c | 6 +++--- fs/xfs/xfs_iops.c | 2 +- fs/xfs/xfs_itable.c | 2 +- fs/xfs/xfs_qm.c | 4 ++-- fs/xfs/xfs_qm_bhv.c | 2 +- 13 files changed, 23 insertions(+), 23 deletions(-)fs/xfs/libxfs/xfs_inode_buf.c +4
-4@@ -206,10 +206,10 @@ xfs_inode_from_disk(*/ if (unlikely (from->di_version ==1 )) {set_nlink (inode,be16_to_cpu (from->di_onlink)); - to->di_projid =0 ; + ip->i_projid =0 ; }else {set_nlink (inode,be32_to_cpu (from->di_nlink)); - to->di_projid = (prid_t )be16_to_cpu (from->di_projid_hi) <<16 | + ip->i_projid = (prid_t )be16_to_cpu (from->di_projid_hi) <<16 |be16_to_cpu (from->di_projid_lo); }@@ -294,8 +294,8 @@ xfs_inode_to_disk( 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 ); - to->di_projid_hi =cpu_to_be16 (from->di_projid >>16 ); + to->di_projid_lo =cpu_to_be16 (ip->i_projid &0xffff ); + to->di_projid_hi =cpu_to_be16 (ip->i_projid >>16 );memset (to->di_pad,0 ,sizeof (to->di_pad)); to->di_atime =xfs_inode_to_disk_ts (ip, inode->i_atime);fs/xfs/libxfs/xfs_inode_buf.h +0
-1@@ -17,7 +17,6 @@ struct xfs_dinode;*/ struct xfs_icdinode {uint16_t di_flushiter;/* incremented on flush */ -prid_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 */ fs/xfs/xfs_bmap_util.c +1
-1@@ -1208,7 +1208,7 @@ xfs_swap_extents_check_format(if (XFS_IS_QUOTA_ON (ip->i_mount) && (!uid_eq (VFS_I (ip)->i_uid,VFS_I (tip)->i_uid) || !gid_eq (VFS_I (ip)->i_gid,VFS_I (tip)->i_gid) || - ip->i_d.di_projid != tip->i_d.di_projid)) + ip->i_projid != tip->i_projid))return -EINVAL ;/* Should never get a local format */ fs/xfs/xfs_dquot.c +1
-1@@ -953,7 +953,7 @@ xfs_qm_id_for_quotatype(case XFS_DQTYPE_GROUP :return i_gid_read (VFS_I (ip));case XFS_DQTYPE_PROJ : -return ip->i_d.di_projid; +return ip->i_projid; }ASSERT (0 );return 0 ;fs/xfs/xfs_icache.c +2
-2@@ -1204,7 +1204,7 @@ xfs_inode_match_id(return false;if ((eofb->eof_flags &XFS_EOF_FLAGS_PRID ) && - ip->i_d.di_projid != eofb->eof_prid) + ip->i_projid != eofb->eof_prid)return false;return true;@@ -1228,7 +1228,7 @@ xfs_inode_match_id_union(return true;if ((eofb->eof_flags &XFS_EOF_FLAGS_PRID ) && - ip->i_d.di_projid == eofb->eof_prid) + ip->i_projid == eofb->eof_prid)return true;return false;fs/xfs/xfs_inode.c +3
-3@@ -809,7 +809,7 @@ xfs_init_new_inode( inode =VFS_I (ip);set_nlink (inode, nlink); inode->i_rdev = rdev; - ip->i_d.di_projid = prid; + ip->i_projid = prid;if (dir && !(dir->i_mode &S_ISGID ) && (mp->m_flags &XFS_MOUNT_GRPID )) {@@ -1288,7 +1288,7 @@ xfs_link(* the tree quota mechanism could be circumvented. */ if (unlikely ((tdp->i_d.di_flags &XFS_DIFLAG_PROJINHERIT ) && - tdp->i_d.di_projid != sip->i_d.di_projid)) { + tdp->i_projid != sip->i_projid)) { error = -EXDEV ; goto error_return; }@@ -3126,7 +3126,7 @@ xfs_rename(* tree quota mechanism would be circumvented. */ if (unlikely ((target_dp->i_d.di_flags &XFS_DIFLAG_PROJINHERIT ) && - target_dp->i_d.di_projid != src_ip->i_d.di_projid)) { + target_dp->i_projid != src_ip->i_projid)) { error = -EXDEV ; goto out_trans_cancel; }fs/xfs/xfs_inode.h +2
-1@@ -54,6 +54,7 @@ typedef struct xfs_inode {/* Miscellaneous state. */ unsigned long i_flags;/* see defined flags below */ uint64_t i_delayed_blks;/* count of delay alloc blks */ +prid_t i_projid;/* owner's project id */ struct xfs_icdinode i_d;/* most of ondisk inode */ @@ -175,7 +176,7 @@ static inline prid_t xfs_get_initial_prid(struct xfs_inode *dp) {if (dp->i_d.di_flags &XFS_DIFLAG_PROJINHERIT ) -return dp->i_d.di_projid; +return dp->i_projid;return XFS_PROJID_DEFAULT ; }fs/xfs/xfs_inode_item.c +2
-2@@ -357,8 +357,8 @@ xfs_inode_to_log_dinode( 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 ; - to->di_projid_hi = from->di_projid >>16 ; + to->di_projid_lo = ip->i_projid &0xffff ; + to->di_projid_hi = ip->i_projid >>16 ;memset (to->di_pad,0 ,sizeof (to->di_pad));memset (to->di_pad3,0 ,sizeof (to->di_pad3));fs/xfs/xfs_ioctl.c +3
-3@@ -1123,7 +1123,7 @@ xfs_fill_fsxattr( 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; + fa->fsx_projid = ip->i_projid;if (ifp && (ifp->if_flags &XFS_IFEXTENTS )) fa->fsx_nextents =xfs_iext_count (ifp);else @@ -1505,12 +1505,12 @@ xfs_ioctl_setattr(VFS_I (ip)->i_mode &= ~(S_ISUID |S_ISGID );/* Change the ownerships and register project quota modifications */ -if (ip->i_d.di_projid != fa->fsx_projid) { +if (ip->i_projid != fa->fsx_projid) {if (XFS_IS_QUOTA_RUNNING (mp) &&XFS_IS_PQUOTA_ON (mp)) { olddquot =xfs_qm_vop_chown (tp, ip, &ip->i_pdquot, pdqp); } - ip->i_d.di_projid = fa->fsx_projid; + ip->i_projid = fa->fsx_projid; }/* fs/xfs/xfs_iops.c +1
-1@@ -737,7 +737,7 @@ xfs_setattr_nonsize(*/ ASSERT (udqp ==NULL );ASSERT (gdqp ==NULL ); - error =xfs_qm_vop_dqalloc (ip, uid, gid, ip->i_d.di_projid, + error =xfs_qm_vop_dqalloc (ip, uid, gid, ip->i_projid, qflags, &udqp, &gdqp,NULL );if (error)return error;fs/xfs/xfs_itable.c +1
-1@@ -86,7 +86,7 @@ xfs_bulkstat_one_int(/* xfs_iget returns the following without needing * further change. */ - buf->bs_projectid = ip->i_d.di_projid; + buf->bs_projectid = ip->i_projid; buf->bs_ino = ino; buf->bs_uid =from_kuid (sb_userns,i_uid_into_mnt (mnt_userns, inode)); buf->bs_gid =from_kgid (sb_userns,i_gid_into_mnt (mnt_userns, inode));fs/xfs/xfs_qm.c +2
-2@@ -1716,7 +1716,7 @@ xfs_qm_vop_dqalloc( }if ((flags &XFS_QMOPT_PQUOTA ) &&XFS_IS_PQUOTA_ON (mp)) {ASSERT (O_pdqpp); -if (ip->i_d.di_projid != prid) { +if (ip->i_projid != prid) {xfs_iunlock (ip, lockflags); error =xfs_qm_dqget (mp, prid,XFS_DQTYPE_PROJ , true, &pq);@@ -1877,7 +1877,7 @@ xfs_qm_vop_create_dqattach( }if (pdqp &&XFS_IS_PQUOTA_ON (mp)) {ASSERT (ip->i_pdquot ==NULL ); -ASSERT (ip->i_d.di_projid == pdqp->q_id); +ASSERT (ip->i_projid == pdqp->q_id); ip->i_pdquot =xfs_qm_dqhold (pdqp);xfs_trans_mod_dquot (tp, pdqp,XFS_TRANS_DQ_ICOUNT ,1 );fs/xfs/xfs_qm_bhv.c +1
-1@@ -60,7 +60,7 @@ xfs_qm_statvfs(struct xfs_mount *mp = ip->i_mount;struct xfs_dquot *dqp; -if (!xfs_qm_dqget (mp, ip->i_d.di_projid,XFS_DQTYPE_PROJ , false, &dqp)) { +if (!xfs_qm_dqget (mp, ip->i_projid,XFS_DQTYPE_PROJ , false, &dqp)) {xfs_fill_statvfs_from_dquot (statp, dqp);xfs_qm_dqput (dqp); }Signature · 1 line
2.30.1
PATCH 8/20 xfs: move the di_size field to struct xfs_inode
In reply to Christoph HellwigIn preparation of removing the historic icinode struct, move the on-disk size field into the containing xfs_inode structure.
--- fs/xfs/libxfs/xfs_bmap.c | 2 +- fs/xfs/libxfs/xfs_dir2.c | 14 +++++------ fs/xfs/libxfs/xfs_dir2_block.c | 10 ++++---- fs/xfs/libxfs/xfs_dir2_leaf.c | 2 +- fs/xfs/libxfs/xfs_dir2_node.c | 2 +- fs/xfs/libxfs/xfs_dir2_sf.c | 46 +++++++++++++++++----------------- fs/xfs/libxfs/xfs_inode_buf.c | 4 +-- fs/xfs/libxfs/xfs_inode_buf.h | 1 - fs/xfs/libxfs/xfs_inode_fork.c | 2 +- fs/xfs/scrub/dir.c | 6 ++--- fs/xfs/scrub/parent.c | 2 +- fs/xfs/scrub/rtbitmap.c | 2 +- fs/xfs/scrub/symlink.c | 2 +- fs/xfs/xfs_aops.c | 4 +-- fs/xfs/xfs_bmap_util.c | 6 ++--- fs/xfs/xfs_dir2_readdir.c | 2 +- fs/xfs/xfs_file.c | 2 +- fs/xfs/xfs_inode.c | 8 +++--- fs/xfs/xfs_inode.h | 5 ++-- fs/xfs/xfs_inode_item.c | 4 +-- fs/xfs/xfs_iomap.c | 2 +- fs/xfs/xfs_iops.c | 12 ++++----- fs/xfs/xfs_itable.c | 2 +- fs/xfs/xfs_pnfs.c | 2 +- fs/xfs/xfs_qm_syscalls.c | 2 +- fs/xfs/xfs_reflink.c | 4 +-- fs/xfs/xfs_rtalloc.c | 12 ++++----- fs/xfs/xfs_symlink.c | 18 ++++++------- fs/xfs/xfs_trace.h | 16 ++++++------ 29 files changed, 98 insertions(+), 98 deletions(-)
fs/xfs/libxfs/xfs_bmap.c +1 -1
@@ -1440,7 +1440,7 @@ xfs_bmap_last_offset(/* * Returns whether the selected fork of the inode has exactly one -* block or not. For the data fork we check this matches di_size, +* block or not. For the data fork we check this matches i_disk_size, * implying the file's range is 0..bsize-1. */ int /* 1=>1 block, 0=>otherwise */
fs/xfs/libxfs/xfs_dir2.c +7 -7
@@ -179,9 +179,9 @@ xfs_dir_isempty(xfs_dir2_sf_hdr_t *sfp;ASSERT (S_ISDIR (VFS_I (dp)->i_mode)); -if (dp->i_d.di_size ==0 )/* might happen during shutdown. */ +if (dp->i_disk_size ==0 )/* might happen during shutdown. */ return 1 ; -if (dp->i_d.di_size >XFS_IFORK_DSIZE (dp)) +if (dp->i_disk_size >XFS_IFORK_DSIZE (dp))return 0 ; sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data;return !sfp->count;
@@ -584,8 +584,8 @@ xfs_dir2_grow_inode(xfs_fsize_t size;/* directory file (data) size */ size =XFS_FSB_TO_B (mp, bno + count); -if (size > dp->i_d.di_size) { - dp->i_d.di_size = size; +if (size > dp->i_disk_size) { + dp->i_disk_size = size;xfs_trans_log_inode (args->trans, dp,XFS_ILOG_CORE ); } }
@@ -608,7 +608,7 @@ xfs_dir2_isblock( rval =XFS_FSB_TO_B (args->dp->i_mount, last) == args->geo->blksize;if (XFS_IS_CORRUPT (args->dp->i_mount, rval !=0 && - args->dp->i_d.di_size != args->geo->blksize)) + args->dp->i_disk_size != args->geo->blksize))return -EFSCORRUPTED ; *vp = rval;return 0 ;
@@ -687,7 +687,7 @@ xfs_dir2_shrink_inode(/* * If the block isn't the last one in the directory, we're done. */ -if (dp->i_d.di_size >xfs_dir2_db_off_to_byte (args->geo, db +1 ,0 )) +if (dp->i_disk_size >xfs_dir2_db_off_to_byte (args->geo, db +1 ,0 ))return 0 ; bno = da;if ((error =xfs_bmap_last_before (tp, dp, &bno,XFS_DATA_FORK ))) {
@@ -703,7 +703,7 @@ xfs_dir2_shrink_inode(/* * Set the size to the new last block. */ - dp->i_d.di_size =XFS_FSB_TO_B (mp, bno); + dp->i_disk_size =XFS_FSB_TO_B (mp, bno);xfs_trans_log_inode (tp, dp,XFS_ILOG_CORE );return 0 ; }
fs/xfs/libxfs/xfs_dir2_block.c +5 -5
@@ -961,7 +961,7 @@ xfs_dir2_leaf_to_block(* been left behind during no-space-reservation operations. * These will show up in the leaf bests table. */ -while (dp->i_d.di_size > args->geo->blksize) { +while (dp->i_disk_size > args->geo->blksize) {int hdrsz; hdrsz = args->geo->data_entry_offset;
@@ -1097,13 +1097,13 @@ xfs_dir2_sf_to_block(trace_xfs_dir2_sf_to_block (args);ASSERT (ifp->if_flags &XFS_IFINLINE ); -ASSERT (dp->i_d.di_size >= offsetof(struct xfs_dir2_sf_hdr , parent)); +ASSERT (dp->i_disk_size >= offsetof(struct xfs_dir2_sf_hdr , parent)); oldsfp = (xfs_dir2_sf_hdr_t *)ifp->if_u1.if_data; -ASSERT (ifp->if_bytes == dp->i_d.di_size); +ASSERT (ifp->if_bytes == dp->i_disk_size);ASSERT (ifp->if_u1.if_data !=NULL ); -ASSERT (dp->i_d.di_size >=xfs_dir2_sf_hdr_size (oldsfp->i8count)); +ASSERT (dp->i_disk_size >=xfs_dir2_sf_hdr_size (oldsfp->i8count));ASSERT (dp->i_df.if_nextents ==0 );/*
@@ -1115,7 +1115,7 @@ xfs_dir2_sf_to_block(xfs_idata_realloc (dp, -ifp->if_bytes,XFS_DATA_FORK );xfs_bmap_local_to_extents_empty (tp, dp,XFS_DATA_FORK ); - dp->i_d.di_size =0 ; + dp->i_disk_size =0 ;/* * Add block 0 to the inode.
fs/xfs/libxfs/xfs_dir2_leaf.c +1 -1
@@ -152,7 +152,7 @@ xfs_dir3_leaf_check_int(/* * XXX (dgc): This value is not restrictive enough. * Should factor in the size of the bests table as well. -* We can deduce a value for that from di_size. +* We can deduce a value for that from i_disk_size. */ if (hdr->count > geo->leaf_max_ents)return __this_address;
fs/xfs/libxfs/xfs_dir2_node.c +1 -1
@@ -441,7 +441,7 @@ xfs_dir2_leaf_to_node( leaf = lbp->b_addr; ltp =xfs_dir2_leaf_tail_p (args->geo, leaf);if (be32_to_cpu (ltp->bestcount) > - (uint )dp->i_d.di_size / args->geo->blksize) { + (uint )dp->i_disk_size / args->geo->blksize) {xfs_buf_mark_corrupt (lbp);return -EFSCORRUPTED ; }
fs/xfs/libxfs/xfs_dir2_sf.c +23 -23
153 lines not on this page · raw message
fs/xfs/libxfs/xfs_inode_buf.c +2 -2
@@ -226,7 +226,7 @@ xfs_inode_from_disk( inode->i_mtime =xfs_inode_from_disk_ts (from, from->di_mtime); inode->i_ctime =xfs_inode_from_disk_ts (from, from->di_ctime); - to->di_size =be64_to_cpu (from->di_size); + ip->i_disk_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_forkoff = from->di_forkoff;
@@ -305,7 +305,7 @@ xfs_inode_to_disk( to->di_gen =cpu_to_be32 (inode->i_generation); to->di_mode =cpu_to_be16 (inode->i_mode); - to->di_size =cpu_to_be64 (from->di_size); + to->di_size =cpu_to_be64 (ip->i_disk_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 (xfs_ifork_nextents (&ip->i_df));
fs/xfs/libxfs/xfs_inode_buf.h +0 -1
@@ -17,7 +17,6 @@ struct xfs_dinode;*/ struct xfs_icdinode {uint16_t di_flushiter;/* incremented on flush */ -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 */
fs/xfs/libxfs/xfs_inode_fork.c +1 -1
@@ -242,7 +242,7 @@ xfs_iformat_data_fork(case S_IFCHR :case S_IFBLK :case S_IFSOCK : - ip->i_d.di_size =0 ; + ip->i_disk_size =0 ; inode->i_rdev =xfs_to_linux_dev_t (xfs_dinode_get_rdev (dip));return 0 ;case S_IFREG :
fs/xfs/scrub/dir.c +3 -3
@@ -538,7 +538,7 @@ xchk_directory_leaf1_bestfree(* There should be as many bestfree slots as there are dir data * blocks that can fit under i_size. */ -if (bestcount !=xfs_dir2_byte_to_db (geo, sc->ip->i_d.di_size)) { +if (bestcount !=xfs_dir2_byte_to_db (geo, sc->ip->i_disk_size)) {xchk_fblock_set_corrupt (sc,XFS_DATA_FORK , lblk); goto out; }
@@ -817,7 +817,7 @@ xchk_directory(return -ENOENT ;/* Plausible size? */ -if (sc->ip->i_d.di_size <xfs_dir2_sf_hdr_size (0 )) { +if (sc->ip->i_disk_size <xfs_dir2_sf_hdr_size (0 )) {xchk_ino_set_corrupt (sc, sc->ip->i_ino); goto out; }
@@ -843,7 +843,7 @@ xchk_directory(* Userspace usually asks for a 32k buffer, so we will too. */ bufsize = (size_t )min_t (loff_t,XFS_READDIR_BUFSIZE , - sc->ip->i_d.di_size); + sc->ip->i_disk_size);/* * Look up every name in this directory by hash.
fs/xfs/scrub/parent.c +1 -1
@@ -102,7 +102,7 @@ xchk_parent_count_parent_dentries(* scanned. */ bufsize = (size_t )min_t (loff_t,XFS_READDIR_BUFSIZE , - parent->i_d.di_size); + parent->i_disk_size); oldpos =0 ;while (true) { error =xfs_readdir (sc->tp, parent, &spc.dc, bufsize);
fs/xfs/scrub/rtbitmap.c +1 -1
@@ -100,7 +100,7 @@ xchk_rtbitmap(int error;/* Is the size of the rtbitmap correct? */ -if (sc->mp->m_rbmip->i_d.di_size != +if (sc->mp->m_rbmip->i_disk_size !=XFS_FSB_TO_B (sc->mp, sc->mp->m_sb.sb_rbmblocks)) {xchk_ino_set_corrupt (sc, sc->mp->m_rbmip->i_ino);return 0 ;
fs/xfs/scrub/symlink.c +1 -1
@@ -43,7 +43,7 @@ xchk_symlink(if (!S_ISLNK (VFS_I (ip)->i_mode))return -ENOENT ; ifp =XFS_IFORK_PTR (ip,XFS_DATA_FORK ); - len = ip->i_d.di_size; + len = ip->i_disk_size;/* Plausible size? */ if (len >XFS_SYMLINK_MAXLEN || len <=0 ) {
fs/xfs/xfs_aops.c +2 -2
@@ -36,7 +36,7 @@ XFS_WPC(struct iomap_writepage_ctx *ctx)static inline bool xfs_ioend_is_append (struct iomap_ioend *ioend) {return ioend->io_offset + ioend->io_size > -XFS_I (ioend->io_inode)->i_d.di_size; +XFS_I (ioend->io_inode)->i_disk_size; }STATIC int
@@ -88,7 +88,7 @@ __xfs_setfilesize(trace_xfs_setfilesize (ip, offset, size); - ip->i_d.di_size = isize; + ip->i_disk_size = isize;xfs_trans_ijoin (tp, ip,XFS_ILOCK_EXCL );xfs_trans_log_inode (tp, ip,XFS_ILOG_CORE );
fs/xfs/xfs_bmap_util.c +3 -3
@@ -423,7 +423,7 @@ xfs_getbmap(break ;case XFS_DATA_FORK :if (!(iflags &BMV_IF_DELALLOC ) && - (ip->i_delayed_blks ||XFS_ISIZE (ip) > ip->i_d.di_size)) { + (ip->i_delayed_blks ||XFS_ISIZE (ip) > ip->i_disk_size)) { error =filemap_write_and_wait (VFS_I (ip)->i_mapping);if (error) goto out_unlock_iolock;
@@ -1663,8 +1663,8 @@ xfs_swap_extents(/* Verify all data are being swapped */ if (sxp->sx_offset !=0 || - sxp->sx_length != ip->i_d.di_size || - sxp->sx_length != tip->i_d.di_size) { + sxp->sx_length != ip->i_disk_size || + sxp->sx_length != tip->i_disk_size) { error = -EFAULT ; goto out_trans_cancel; }
fs/xfs/xfs_dir2_readdir.c +1 -1
@@ -58,7 +58,7 @@ xfs_dir2_sf_getdents(struct xfs_da_geometry *geo = args->geo;ASSERT (dp->i_df.if_flags &XFS_IFINLINE ); -ASSERT (dp->i_df.if_bytes == dp->i_d.di_size); +ASSERT (dp->i_df.if_bytes == dp->i_disk_size);ASSERT (dp->i_df.if_u1.if_data !=NULL ); sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data;
fs/xfs/xfs_file.c +1 -1
@@ -1244,7 +1244,7 @@ xfs_file_readdir(* point we can change the ->readdir prototype to include the * buffer size. For now we use the current glibc buffer size. */ - bufsize = (size_t )min_t (loff_t,XFS_READDIR_BUFSIZE , ip->i_d.di_size); + bufsize = (size_t )min_t (loff_t,XFS_READDIR_BUFSIZE , ip->i_disk_size);return xfs_readdir (NULL , ip, ctx, bufsize); }
fs/xfs/xfs_inode.c +4 -4
@@ -830,7 +830,7 @@ xfs_init_new_inode( !in_group_p(i_gid_into_mnt(mnt_userns, inode))) inode->i_mode &= ~S_ISGID; - ip->i_d.di_size =0 ; + ip->i_disk_size =0 ; ip->i_df.if_nextents =0 ;ASSERT (ip->i_d.di_nblocks ==0 );
@@ -1558,7 +1558,7 @@ xfs_inactive_truncate(* of a system crash before the truncate completes. See the related * comment in xfs_vn_setattr_size() for details. */ - ip->i_d.di_size =0 ; + ip->i_disk_size =0 ;xfs_trans_log_inode (tp, ip,XFS_ILOG_CORE ); error =xfs_itruncate_extents (&tp, ip,XFS_DATA_FORK ,0 );
@@ -1737,7 +1737,7 @@ xfs_inactive( }if (S_ISREG (VFS_I (ip)->i_mode) && - (ip->i_d.di_size !=0 ||XFS_ISIZE (ip) !=0 || + (ip->i_disk_size !=0 ||XFS_ISIZE (ip) !=0 || ip->i_df.if_nextents >0 || ip->i_delayed_blks >0 )) truncate =1 ;
@@ -2585,7 +2585,7 @@ xfs_ifree(ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL ));ASSERT (VFS_I (ip)->i_nlink ==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_disk_size ==0 || !S_ISREG (VFS_I (ip)->i_mode));ASSERT (ip->i_d.di_nblocks ==0 );/*
fs/xfs/xfs_inode.h +3 -2
@@ -54,6 +54,7 @@ typedef struct xfs_inode {/* Miscellaneous state. */ unsigned long i_flags;/* see defined flags below */ uint64_t i_delayed_blks;/* count of delay alloc blks */ +xfs_fsize_t i_disk_size;/* number of bytes in file */ prid_t i_projid;/* owner's project id */ struct xfs_icdinode i_d;/* most of ondisk inode */
@@ -88,7 +89,7 @@ static inline xfs_fsize_t XFS_ISIZE(struct xfs_inode *ip) {if (S_ISREG (VFS_I (ip)->i_mode))return i_size_read (VFS_I (ip)); -return ip->i_d.di_size; +return ip->i_disk_size; }/*
@@ -102,7 +103,7 @@ xfs_new_eof(struct xfs_inode *ip, xfs_fsize_t new_size)if (new_size > i_size || new_size <0 ) new_size = i_size; -return new_size > ip->i_d.di_size ? new_size :0 ; +return new_size > ip->i_disk_size ? new_size :0 ; }/*
fs/xfs/xfs_inode_item.c +2 -2
@@ -196,7 +196,7 @@ xfs_inode_item_format_data_fork(*/ data_bytes =roundup (ip->i_df.if_bytes,4 );ASSERT (ip->i_df.if_u1.if_data !=NULL ); -ASSERT (ip->i_d.di_size >0 ); +ASSERT (ip->i_disk_size >0 );xlog_copy_iovec (lv, vecp,XLOG_REG_TYPE_ILOCAL , ip->i_df.if_u1.if_data, data_bytes); ilf->ilf_dsize = (unsigned )data_bytes;
@@ -369,7 +369,7 @@ xfs_inode_to_log_dinode( to->di_gen = inode->i_generation; to->di_mode = inode->i_mode; - to->di_size = from->di_size; + to->di_size = ip->i_disk_size; to->di_nblocks = from->di_nblocks; to->di_extsize = from->di_extsize; to->di_nextents =xfs_ifork_nextents (&ip->i_df);
fs/xfs/xfs_iomap.c +1 -1
@@ -572,7 +572,7 @@ xfs_iomap_write_unwritten(i_size_write (inode, i_size); i_size =xfs_new_eof (ip, i_size);if (i_size) { - ip->i_d.di_size = i_size; + ip->i_disk_size = i_size;xfs_trans_log_inode (tp, ip,XFS_ILOG_CORE ); }
fs/xfs/xfs_iops.c +6 -6
@@ -949,8 +949,8 @@ xfs_setattr_size(* operation. * * And we update in-core i_size and truncate page cache beyond newsize -* before writeback the [di_size, newsize] range, so we're guaranteed -* not to write stale data past the new EOF on truncate down. +* before writeback the [i_disk_size, newsize] range, so we're +* guaranteed not to write stale data past the new EOF on truncate down. */ truncate_setsize (inode, newsize);
@@ -963,9 +963,9 @@ xfs_setattr_size(* otherwise those blocks may not be zeroed after a crash. */ if (did_zeroing || - (newsize > ip->i_d.di_size && oldsize != ip->i_d.di_size)) { + (newsize > ip->i_disk_size && oldsize != ip->i_disk_size)) { error =filemap_write_and_wait_range (VFS_I (ip)->i_mapping, - ip->i_d.di_size, newsize -1 ); + ip->i_disk_size, newsize -1 );if (error)return error; }
@@ -1007,7 +1007,7 @@ xfs_setattr_size(* permanent before actually freeing any blocks it doesn't matter if * they get written to. */ - ip->i_d.di_size = newsize; + ip->i_disk_size = newsize;xfs_trans_log_inode (tp, ip,XFS_ILOG_CORE );if (newsize <= oldsize) {
@@ -1344,7 +1344,7 @@ xfs_setup_inode(/* make the inode look hashed for the writeback code */ inode_fake_hash (inode); -i_size_write (inode, ip->i_d.di_size); +i_size_write (inode, ip->i_disk_size);xfs_diflags_to_iflags (ip, true);if (S_ISDIR (inode->i_mode)) {
fs/xfs/xfs_itable.c +1 -1
@@ -90,7 +90,7 @@ xfs_bulkstat_one_int( buf->bs_ino = ino; buf->bs_uid =from_kuid (sb_userns,i_uid_into_mnt (mnt_userns, inode)); buf->bs_gid =from_kgid (sb_userns,i_gid_into_mnt (mnt_userns, inode)); - buf->bs_size = dic->di_size; + buf->bs_size = ip->i_disk_size; buf->bs_nlink = inode->i_nlink; buf->bs_atime = inode->i_atime.tv_sec;
fs/xfs/xfs_pnfs.c +1 -1
@@ -286,7 +286,7 @@ xfs_fs_commit_blocks(xfs_setattr_time (ip, iattr);if (update_isize) {i_size_write (inode, iattr->ia_size); - ip->i_d.di_size = iattr->ia_size; + ip->i_disk_size = iattr->ia_size; }xfs_trans_set_sync (tp);
fs/xfs/xfs_qm_syscalls.c +1 -1
@@ -293,7 +293,7 @@ xfs_qm_scall_trunc_qfile(xfs_ilock (ip,XFS_ILOCK_EXCL );xfs_trans_ijoin (tp, ip,0 ); - ip->i_d.di_size =0 ; + ip->i_disk_size =0 ;xfs_trans_log_inode (tp, ip,XFS_ILOG_CORE ); error =xfs_itruncate_extents (&tp, ip,XFS_DATA_FORK ,0 );
fs/xfs/xfs_reflink.c +2 -2
@@ -930,7 +930,7 @@ xfs_reflink_update_dest(if (newlen >i_size_read (VFS_I (dest))) {trace_xfs_reflink_update_inode_size (dest, newlen);i_size_write (VFS_I (dest), newlen); - dest->i_d.di_size = newlen; + dest->i_disk_size = newlen; }if (cowextsize) {
@@ -1156,7 +1156,7 @@ xfs_reflink_remap_extent(if (newlen >i_size_read (VFS_I (ip))) {trace_xfs_reflink_update_inode_size (ip, newlen);i_size_write (VFS_I (ip), newlen); - ip->i_d.di_size = newlen; + ip->i_disk_size = newlen;xfs_trans_log_inode (tp, ip,XFS_ILOG_CORE ); }
fs/xfs/xfs_rtalloc.c +6 -6
@@ -966,8 +966,8 @@ xfs_growfs_rt(* Get the old block counts for bitmap and summary inodes. * These can't change since other growfs callers are locked out. */ - rbmblocks =XFS_B_TO_FSB (mp, mp->m_rbmip->i_d.di_size); - rsumblocks =XFS_B_TO_FSB (mp, mp->m_rsumip->i_d.di_size); + rbmblocks =XFS_B_TO_FSB (mp, mp->m_rbmip->i_disk_size); + rsumblocks =XFS_B_TO_FSB (mp, mp->m_rsumip->i_disk_size);/* * Allocate space to the bitmap and summary files, as necessary. */
@@ -1036,9 +1036,9 @@ xfs_growfs_rt(* to update the incore size so that inode inactivation won't * punch what it thinks are "posteof" blocks. */ - mp->m_rbmip->i_d.di_size = + mp->m_rbmip->i_disk_size = nsbp->sb_rbmblocks * nsbp->sb_blocksize; -i_size_write (VFS_I (mp->m_rbmip), mp->m_rbmip->i_d.di_size); +i_size_write (VFS_I (mp->m_rbmip), mp->m_rbmip->i_disk_size);xfs_trans_log_inode (tp, mp->m_rbmip,XFS_ILOG_CORE );/* * Get the summary inode into the transaction.
@@ -1050,8 +1050,8 @@ xfs_growfs_rt(* incore size so that inode inactivation won't punch what it * thinks are "posteof" blocks. */ - mp->m_rsumip->i_d.di_size = nmp->m_rsumsize; -i_size_write (VFS_I (mp->m_rsumip), mp->m_rsumip->i_d.di_size); + mp->m_rsumip->i_disk_size = nmp->m_rsumsize; +i_size_write (VFS_I (mp->m_rsumip), mp->m_rsumip->i_disk_size);xfs_trans_log_inode (tp, mp->m_rsumip,XFS_ILOG_CORE );/* * Copy summary data from old to new sizes.
fs/xfs/xfs_symlink.c +9 -9
@@ -33,7 +33,7 @@ xfs_readlink_bmap_ilocked(struct xfs_buf *bp;xfs_daddr_t d;char *cur_chunk; -int pathlen = ip->i_d.di_size; +int pathlen = ip->i_disk_size;int nmaps =XFS_SYMLINK_MAPS ;int byte_cnt;int n;
@@ -86,7 +86,7 @@ xfs_readlink_bmap_ilocked( }ASSERT (pathlen ==0 ); - link[ip->i_d.di_size] ='\0' ; + link[ip->i_disk_size] ='\0' ; error =0 ; out:
@@ -111,7 +111,7 @@ xfs_readlink(xfs_ilock (ip,XFS_ILOCK_SHARED ); - pathlen = ip->i_d.di_size; + pathlen = ip->i_disk_size;if (!pathlen) goto out;
@@ -250,7 +250,7 @@ xfs_symlink(if (pathlen <=XFS_IFORK_DSIZE (ip)) {xfs_init_local_fork (ip,XFS_DATA_FORK , target_path, pathlen); - ip->i_d.di_size = pathlen; + ip->i_disk_size = pathlen; ip->i_df.if_format =XFS_DINODE_FMT_LOCAL ;xfs_trans_log_inode (tp, ip,XFS_ILOG_DDATA |XFS_ILOG_CORE ); }else {
@@ -265,7 +265,7 @@ xfs_symlink( goto out_trans_cancel; resblks -= fs_blocks; - ip->i_d.di_size = pathlen; + ip->i_disk_size = pathlen;xfs_trans_log_inode (tp, ip,XFS_ILOG_CORE ); cur_chunk = target_path;
@@ -300,7 +300,7 @@ xfs_symlink( }ASSERT (pathlen ==0 ); } -i_size_write (VFS_I (ip), ip->i_d.di_size); +i_size_write (VFS_I (ip), ip->i_disk_size);/* * Create the directory entry for the symlink.
@@ -400,8 +400,8 @@ xfs_inactive_symlink_rmt(* locked for the second transaction. In the error paths we need it * held so the cancel won't rele it, see below. */ - size = (int )ip->i_d.di_size; - ip->i_d.di_size =0 ; + size = (int )ip->i_disk_size; + ip->i_disk_size =0 ;VFS_I (ip)->i_mode = (VFS_I (ip)->i_mode & ~S_IFMT ) |S_IFREG ;xfs_trans_log_inode (tp, ip,XFS_ILOG_CORE );/*
@@ -477,7 +477,7 @@ xfs_inactive_symlink(return -EIO ;xfs_ilock (ip,XFS_ILOCK_EXCL ); - pathlen = (int )ip->i_d.di_size; + pathlen = (int )ip->i_disk_size;ASSERT (pathlen);if (pathlen <=0 || pathlen >XFS_SYMLINK_MAXLEN ) {
fs/xfs/xfs_trace.h +8 -8
@@ -1298,7 +1298,7 @@ DECLARE_EVENT_CLASS(xfs_file_class,TP_fast_assign ( __entry->dev = file_inode(iocb->ki_filp)->i_sb->s_dev; __entry->ino =XFS_I (file_inode (iocb->ki_filp))->i_ino; - __entry->size =XFS_I (file_inode (iocb->ki_filp))->i_d.di_size; + __entry->size =XFS_I (file_inode (iocb->ki_filp))->i_disk_size; __entry->offset = iocb->ki_pos; __entry->count =iov_iter_count (iter); ),
@@ -1341,7 +1341,7 @@ DECLARE_EVENT_CLASS(xfs_imap_class,TP_fast_assign ( __entry->dev = VFS_I(ip)->i_sb->s_dev; __entry->ino = ip->i_ino; - __entry->size = ip->i_d.di_size; + __entry->size = ip->i_disk_size; __entry->offset = offset; __entry->count = count; __entry->whichfork = whichfork;
@@ -1387,7 +1387,7 @@ DECLARE_EVENT_CLASS(xfs_simple_io_class, __entry->dev =VFS_I (ip)->i_sb->s_dev; __entry->ino = ip->i_ino; __entry->isize =VFS_I (ip)->i_size; - __entry->disize = ip->i_d.di_size; + __entry->disize = ip->i_disk_size; __entry->offset = offset; __entry->count = count; ),
@@ -1425,7 +1425,7 @@ DECLARE_EVENT_CLASS(xfs_itrunc_class,TP_fast_assign ( __entry->dev = VFS_I(ip)->i_sb->s_dev; __entry->ino = ip->i_ino; - __entry->size = ip->i_d.di_size; + __entry->size = ip->i_disk_size; __entry->new_size = new_size; ), TP_printk("dev %d:%d ino 0x%llx size 0x%llx new_size 0x%llx",
@@ -1455,7 +1455,7 @@ TRACE_EVENT(xfs_pagecache_inval,TP_fast_assign ( __entry->dev = VFS_I(ip)->i_sb->s_dev; __entry->ino = ip->i_ino; - __entry->size = ip->i_d.di_size; + __entry->size = ip->i_disk_size; __entry->start = start; __entry->finish = finish; ),
@@ -1483,7 +1483,7 @@ TRACE_EVENT(xfs_bunmap,TP_fast_assign ( __entry->dev = VFS_I(ip)->i_sb->s_dev; __entry->ino = ip->i_ino; - __entry->size = ip->i_d.di_size; + __entry->size = ip->i_disk_size; __entry->bno = bno; __entry->len = len; __entry->caller_ip = caller_ip;
@@ -3145,12 +3145,12 @@ DECLARE_EVENT_CLASS(xfs_double_io_class, __entry->dev =VFS_I (src)->i_sb->s_dev; __entry->src_ino = src->i_ino; __entry->src_isize =VFS_I (src)->i_size; - __entry->src_disize = src->i_d.di_size; + __entry->src_disize = src->i_disk_size; __entry->src_offset = soffset; __entry->len = len; __entry->dest_ino = dest->i_ino; __entry->dest_isize =VFS_I (dest)->i_size; - __entry->dest_disize = dest->i_d.di_size; + __entry->dest_disize = dest->i_disk_size; __entry->dest_offset = doffset; ), TP_printk("dev %d:%d count %zd "
Signature · 1 line
2.30.1
PATCH 9/20 xfs: move the di_nblocks field to struct xfs_inode
In reply to Christoph HellwigIn preparation of removing the historic icinode struct, move the nblocks field into the containing xfs_inode structure.
--- fs/xfs/libxfs/xfs_bmap.c | 12 ++++++------ fs/xfs/libxfs/xfs_bmap_btree.c | 4 ++-- fs/xfs/libxfs/xfs_da_btree.c | 4 ++-- fs/xfs/libxfs/xfs_inode_buf.c | 4 ++-- fs/xfs/libxfs/xfs_inode_buf.h | 1 - fs/xfs/libxfs/xfs_inode_fork.c | 2 +- fs/xfs/xfs_bmap_util.c | 8 ++++---- fs/xfs/xfs_icache.c | 4 ++-- fs/xfs/xfs_inode.c | 8 ++++---- fs/xfs/xfs_inode.h | 1 + fs/xfs/xfs_inode_item.c | 2 +- fs/xfs/xfs_iops.c | 3 +-- fs/xfs/xfs_itable.c | 2 +- fs/xfs/xfs_qm.c | 8 ++++---- fs/xfs/xfs_quotaops.c | 2 +- fs/xfs/xfs_trans.c | 2 +- 16 files changed, 33 insertions(+), 34 deletions(-)
fs/xfs/libxfs/xfs_bmap.c +6 -6
@@ -624,7 +624,7 @@ xfs_bmap_btree_to_extents(return error;xfs_rmap_ino_bmbt_owner (&oinfo, ip->i_ino, whichfork);xfs_bmap_add_free (cur->bc_tp, cbno,1 , &oinfo); - ip->i_d.di_nblocks--; + ip->i_nblocks--;xfs_trans_mod_dquot_byino (tp, ip,XFS_TRANS_DQ_BCOUNT ,-1L );xfs_trans_binval (tp, cbp);if (cur->bc_bufs[0 ] == cbp)
@@ -726,7 +726,7 @@ xfs_bmap_extents_to_btree( args.agno >= XFS_FSB_TO_AGNO(mp, tp->t_firstblock)); tp->t_firstblock = args.fsbno; cur->bc_ino.allocated++; - ip->i_d.di_nblocks++; + ip->i_nblocks++;xfs_trans_mod_dquot_byino (tp, ip,XFS_TRANS_DQ_BCOUNT ,1L ); error = xfs_trans_get_buf(tp, mp->m_ddev_targp, XFS_FSB_TO_DADDR(mp, args.fsbno),
@@ -908,7 +908,7 @@ xfs_bmap_local_to_extents(xfs_iext_insert (ip, &icur, &rec,0 ); ifp->if_nextents =1 ; - ip->i_d.di_nblocks =1 ; + ip->i_nblocks =1 ;xfs_trans_mod_dquot_byino (tp, ip,XFS_TRANS_DQ_BCOUNT ,1L ); flags |=xfs_ilog_fext (whichfork);
@@ -3443,7 +3443,7 @@ xfs_bmap_btalloc_accounting( }/* data/attr fork only */ - ap->ip->i_d.di_nblocks += args->len; + ap->ip->i_nblocks += args->len;xfs_trans_log_inode (ap->tp, ap->ip,XFS_ILOG_CORE );if (ap->wasdel) { ap->ip->i_delayed_blks -= args->len;
@@ -4763,7 +4763,7 @@ xfs_bmapi_remap(ASSERT (got.br_startoff - bno >= len); } - ip->i_d.di_nblocks += len; + ip->i_nblocks += len;xfs_trans_log_inode (tp, ip,XFS_ILOG_CORE );if (ifp->if_flags &XFS_IFBROOT ) {
@@ -5354,7 +5354,7 @@ xfs_bmap_del_extent_real(* Adjust inode # blocks in the file. */ if (nblks) - ip->i_d.di_nblocks -= nblks; + ip->i_nblocks -= nblks;/* * Adjust quota data. */
fs/xfs/libxfs/xfs_bmap_btree.c +2 -2
@@ -260,7 +260,7 @@ xfs_bmbt_alloc_block(ASSERT (args.len ==1 ); cur->bc_tp->t_firstblock = args.fsbno; cur->bc_ino.allocated++; - cur->bc_ino.ip->i_d.di_nblocks++; + cur->bc_ino.ip->i_nblocks++;xfs_trans_log_inode (args.tp, cur->bc_ino.ip,XFS_ILOG_CORE );xfs_trans_mod_dquot_byino (args.tp, cur->bc_ino.ip,XFS_TRANS_DQ_BCOUNT ,1L );
@@ -287,7 +287,7 @@ xfs_bmbt_free_block(xfs_rmap_ino_bmbt_owner (&oinfo, ip->i_ino, cur->bc_ino.whichfork);xfs_bmap_add_free (cur->bc_tp, fsbno,1 , &oinfo); - ip->i_d.di_nblocks--; + ip->i_nblocks--;xfs_trans_log_inode (tp, ip,XFS_ILOG_CORE );xfs_trans_mod_dquot_byino (tp, ip,XFS_TRANS_DQ_BCOUNT ,-1L );
fs/xfs/libxfs/xfs_da_btree.c +2 -2
@@ -2145,7 +2145,7 @@ xfs_da_grow_inode_int(struct xfs_trans *tp = args->trans;struct xfs_inode *dp = args->dp;int w = args->whichfork; -xfs_rfsblock_t nblks = dp->i_d.di_nblocks; +xfs_rfsblock_t nblks = dp->i_nblocks;struct xfs_bmbt_irec map, *mapp;int nmap, error, got, i, mapi;
@@ -2211,7 +2211,7 @@ xfs_da_grow_inode_int( }/* account for newly allocated blocks in reserved blocks total */ - args->total -= dp->i_d.di_nblocks - nblks; + args->total -= dp->i_nblocks - nblks; out_free_map:if (mapp != &map)
fs/xfs/libxfs/xfs_inode_buf.c +2 -2
@@ -227,7 +227,7 @@ xfs_inode_from_disk( inode->i_ctime =xfs_inode_from_disk_ts (from, from->di_ctime); ip->i_disk_size =be64_to_cpu (from->di_size); - to->di_nblocks =be64_to_cpu (from->di_nblocks); + ip->i_nblocks =be64_to_cpu (from->di_nblocks); to->di_extsize =be32_to_cpu (from->di_extsize); to->di_forkoff = from->di_forkoff; to->di_flags =be16_to_cpu (from->di_flags);
@@ -306,7 +306,7 @@ xfs_inode_to_disk( to->di_mode =cpu_to_be16 (inode->i_mode); to->di_size =cpu_to_be64 (ip->i_disk_size); - to->di_nblocks =cpu_to_be64 (from->di_nblocks); + to->di_nblocks =cpu_to_be64 (ip->i_nblocks); to->di_extsize =cpu_to_be32 (from->di_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));
fs/xfs/libxfs/xfs_inode_buf.h +0 -1
@@ -17,7 +17,6 @@ struct xfs_dinode;*/ struct xfs_icdinode {uint16_t di_flushiter;/* incremented on flush */ -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 */ uint16_t di_flags;/* random flags, XFS_DIFLAG_... */
fs/xfs/libxfs/xfs_inode_fork.c +1 -1
@@ -194,7 +194,7 @@ xfs_iformat_btree( nrecs == 0 || XFS_BMDR_SPACE_CALC(nrecs) > XFS_DFORK_SIZE(dip, mp, whichfork) || - ifp->if_nextents > ip->i_d.di_nblocks) || + ifp->if_nextents > ip->i_nblocks) || level == 0 || level > XFS_BM_MAXLEVELS(mp, whichfork)) {xfs_warn (mp,"corrupt inode %Lu (btree)." , (unsigned long long ) ip->i_ino);
fs/xfs/xfs_bmap_util.c +4 -4
@@ -154,7 +154,7 @@ xfs_bmap_rtalloc( ap->blkno *= mp->m_sb.sb_rextsize; ralen *= mp->m_sb.sb_rextsize; ap->length = ralen; - ap->ip->i_d.di_nblocks += ralen; + ap->ip->i_nblocks += ralen;xfs_trans_log_inode (ap->tp, ap->ip,XFS_ILOG_CORE );if (ap->wasdel) ap->ip->i_delayed_blks -= ralen;
@@ -1476,9 +1476,9 @@ xfs_swap_extent_forks(/* * Fix the on-disk inode values */ - tmp = (uint64_t )ip->i_d.di_nblocks; - ip->i_d.di_nblocks = tip->i_d.di_nblocks - taforkblks + aforkblks; - tip->i_d.di_nblocks = tmp + taforkblks - aforkblks; + tmp = (uint64_t )ip->i_nblocks; + ip->i_nblocks = tip->i_nblocks - taforkblks + aforkblks; + tip->i_nblocks = tmp + taforkblks - aforkblks;/* * The extents in the source inode could still contain speculative
fs/xfs/xfs_icache.c +2 -2
@@ -64,7 +64,7 @@ xfs_inode_alloc( ip->i_flags =0 ; ip->i_delayed_blks =0 ; ip->i_d.di_flags2 = mp->m_ino_geo.new_diflags2; - ip->i_d.di_nblocks =0 ; + ip->i_nblocks =0 ; ip->i_d.di_forkoff =0 ; ip->i_sick =0 ; ip->i_checked =0 ;
@@ -309,7 +309,7 @@ xfs_iget_check_free_state(return -EFSCORRUPTED ; } -if (ip->i_d.di_nblocks !=0 ) { +if (ip->i_nblocks !=0 ) {xfs_warn (ip->i_mount,"Corruption detected! Free inode 0x%llx has blocks allocated!" , ip->i_ino);
fs/xfs/xfs_inode.c +4 -4
@@ -832,7 +832,7 @@ xfs_init_new_inode( ip->i_disk_size =0 ; ip->i_df.if_nextents =0 ; -ASSERT (ip->i_d.di_nblocks ==0 ); +ASSERT (ip->i_nblocks ==0 ); tv =current_time (inode); inode->i_mtime = tv;
@@ -2586,7 +2586,7 @@ xfs_ifree(ASSERT (VFS_I (ip)->i_nlink ==0 );ASSERT (ip->i_df.if_nextents ==0 );ASSERT (ip->i_disk_size ==0 || !S_ISREG (VFS_I (ip)->i_mode)); -ASSERT (ip->i_d.di_nblocks ==0 ); +ASSERT (ip->i_nblocks ==0 );/* * Pull the on-disk inode from the AGI unlinked list.
@@ -3436,13 +3436,13 @@ xfs_iflush( } }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 )) { + ip->i_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_df.if_nextents +xfs_ifork_nextents (ip->i_afp), - ip->i_d.di_nblocks, ip); + ip->i_nblocks, ip); goto flush_out; } if (XFS_TEST_ERROR(ip->i_d.di_forkoff > mp->m_sb.sb_inodesize,
fs/xfs/xfs_inode.h +1 -0
@@ -55,6 +55,7 @@ typedef struct xfs_inode {unsigned long i_flags;/* see defined flags below */ uint64_t i_delayed_blks;/* count of delay alloc blks */ xfs_fsize_t i_disk_size;/* number of bytes in file */ +xfs_rfsblock_t i_nblocks;/* # of direct & btree blocks */ prid_t i_projid;/* owner's project id */ struct xfs_icdinode i_d;/* most of ondisk inode */
fs/xfs/xfs_inode_item.c +1 -1
@@ -370,7 +370,7 @@ xfs_inode_to_log_dinode( to->di_mode = inode->i_mode; to->di_size = ip->i_disk_size; - to->di_nblocks = from->di_nblocks; + to->di_nblocks = ip->i_nblocks; to->di_extsize = from->di_extsize; to->di_nextents =xfs_ifork_nextents (&ip->i_df); to->di_anextents =xfs_ifork_nextents (ip->i_afp);
fs/xfs/xfs_iops.c +1 -2
@@ -594,8 +594,7 @@ xfs_vn_getattr( stat->atime = inode->i_atime; stat->mtime = inode->i_mtime; stat->ctime = inode->i_ctime; - stat->blocks = -XFS_FSB_TO_BB (mp, ip->i_d.di_nblocks + ip->i_delayed_blks); + stat->blocks =XFS_FSB_TO_BB (mp, ip->i_nblocks + ip->i_delayed_blks);if (xfs_sb_version_has_v3inode (&mp->m_sb)) {if (request_mask &STATX_BTIME ) {
fs/xfs/xfs_itable.c +1 -1
@@ -132,7 +132,7 @@ xfs_bulkstat_one_int(case XFS_DINODE_FMT_BTREE : buf->bs_rdev =0 ; buf->bs_blksize = mp->m_sb.sb_blocksize; - buf->bs_blocks = dic->di_nblocks + ip->i_delayed_blks; + buf->bs_blocks = ip->i_nblocks + ip->i_delayed_blks;break ; }xfs_iunlock (ip,XFS_ILOCK_SHARED );
fs/xfs/xfs_qm.c +4 -4
@@ -992,7 +992,7 @@ xfs_qm_reset_dqcounts_buf(* trans_reserve. But, this gets called during quotacheck, and that * happens only at mount time which is single threaded. */ -if (qip->i_d.di_nblocks ==0 ) +if (qip->i_nblocks ==0 )return 0 ; map =kmem_alloc (XFS_DQITER_MAP_SIZE *sizeof (*map),0 );
@@ -1174,7 +1174,7 @@ xfs_qm_dqusage_adjust(xfs_bmap_count_leaves (ifp, &rtblks); } - nblks = (xfs_qcnt_t )ip->i_d.di_nblocks - rtblks; + nblks = (xfs_qcnt_t )ip->i_nblocks - rtblks;/* * Add the (disk blocks and inode) resources occupied by this
@@ -1779,11 +1779,11 @@ xfs_qm_vop_chown(ASSERT (prevdq);ASSERT (prevdq != newdq); -xfs_trans_mod_dquot (tp, prevdq, bfield, -(ip->i_d.di_nblocks)); +xfs_trans_mod_dquot (tp, prevdq, bfield, -(ip->i_nblocks));xfs_trans_mod_dquot (tp, prevdq,XFS_TRANS_DQ_ICOUNT ,-1 );/* the sparkling new dquot */ -xfs_trans_mod_dquot (tp, newdq, bfield, ip->i_d.di_nblocks); +xfs_trans_mod_dquot (tp, newdq, bfield, ip->i_nblocks);xfs_trans_mod_dquot (tp, newdq,XFS_TRANS_DQ_ICOUNT ,1 );/*
fs/xfs/xfs_quotaops.c +1 -1
@@ -35,7 +35,7 @@ xfs_qm_fill_state( tempqip = true; } tstate->flags |=QCI_SYSFILE ; - tstate->blocks = ip->i_d.di_nblocks; + tstate->blocks = ip->i_nblocks; tstate->nextents = ip->i_df.if_nextents; tstate->spc_timelimit = (u32 )defq->blk.time; tstate->ino_timelimit = (u32 )defq->ino.time;
fs/xfs/xfs_trans.c +1 -1
@@ -1189,7 +1189,7 @@ xfs_trans_alloc_ichange(* though that part is only semi-transactional. */ error =xfs_trans_reserve_quota_bydquots (tp, mp, udqp, gdqp, - pdqp, ip->i_d.di_nblocks + ip->i_delayed_blks, + pdqp, ip->i_nblocks + ip->i_delayed_blks,1 , qflags);if ((error == -EDQUOT || error == -ENOSPC ) && !retried) {xfs_trans_cancel (tp);
Signature · 1 line
2.30.1
PATCH 10/20 xfs: move the di_extsize field to struct xfs_inode
In reply to Christoph HellwigIn preparation of removing the historic icinode struct, move the extsize field into the containing xfs_inode structure.
--- fs/xfs/libxfs/xfs_bmap.c | 2 +- fs/xfs/libxfs/xfs_inode_buf.c | 4 ++-- fs/xfs/libxfs/xfs_inode_buf.h | 1 - fs/xfs/xfs_inode.c | 10 +++++----- fs/xfs/xfs_inode.h | 1 + fs/xfs/xfs_inode_item.c | 2 +- fs/xfs/xfs_ioctl.c | 10 +++++----- fs/xfs/xfs_itable.c | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-)
fs/xfs/libxfs/xfs_bmap.c +1 -1
@@ -2937,7 +2937,7 @@ xfs_bmap_add_extent_hole_real(*/ /* -* Adjust the size of the new extent based on di_extsize and rt extsize. +* Adjust the size of the new extent based on i_extsize and rt extsize. */ int xfs_bmap_extsize_align(
fs/xfs/libxfs/xfs_inode_buf.c +2 -2
@@ -228,7 +228,7 @@ xfs_inode_from_disk( ip->i_disk_size =be64_to_cpu (from->di_size); ip->i_nblocks =be64_to_cpu (from->di_nblocks); - to->di_extsize =be32_to_cpu (from->di_extsize); + ip->i_extsize =be32_to_cpu (from->di_extsize); to->di_forkoff = from->di_forkoff; to->di_flags =be16_to_cpu (from->di_flags);
@@ -307,7 +307,7 @@ xfs_inode_to_disk( to->di_size =cpu_to_be64 (ip->i_disk_size); to->di_nblocks =cpu_to_be64 (ip->i_nblocks); - to->di_extsize =cpu_to_be32 (from->di_extsize); + 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;
fs/xfs/libxfs/xfs_inode_buf.h +0 -1
@@ -17,7 +17,6 @@ struct xfs_dinode;*/ struct xfs_icdinode {uint16_t di_flushiter;/* incremented on flush */ -xfs_extlen_t di_extsize;/* basic/minimum extent size for file */ uint8_t di_forkoff;/* attr fork offs, <<3 for 64b align */ uint16_t di_flags;/* random flags, XFS_DIFLAG_... */
fs/xfs/xfs_inode.c +5 -5
@@ -60,8 +60,8 @@ xfs_get_extsz_hint(*/ if (xfs_is_always_cow_inode (ip))return 0 ; -if ((ip->i_d.di_flags &XFS_DIFLAG_EXTSIZE ) && ip->i_d.di_extsize) -return ip->i_d.di_extsize; +if ((ip->i_d.di_flags &XFS_DIFLAG_EXTSIZE ) && ip->i_extsize) +return ip->i_extsize;if (XFS_IS_REALTIME_INODE (ip))return ip->i_mount->m_sb.sb_rextsize;return 0 ;
@@ -712,7 +712,7 @@ xfs_inode_inherit_flags( di_flags |=XFS_DIFLAG_RTINHERIT ;if (pip->i_d.di_flags &XFS_DIFLAG_EXTSZINHERIT ) { di_flags |=XFS_DIFLAG_EXTSZINHERIT ; - ip->i_d.di_extsize = pip->i_d.di_extsize; + ip->i_extsize = pip->i_extsize; }if (pip->i_d.di_flags &XFS_DIFLAG_PROJINHERIT ) di_flags |=XFS_DIFLAG_PROJINHERIT ;
@@ -722,7 +722,7 @@ xfs_inode_inherit_flags( di_flags |=XFS_DIFLAG_REALTIME ;if (pip->i_d.di_flags &XFS_DIFLAG_EXTSZINHERIT ) { di_flags |=XFS_DIFLAG_EXTSIZE ; - ip->i_d.di_extsize = pip->i_d.di_extsize; + ip->i_extsize = pip->i_extsize; } } if ((pip->i_d.di_flags & XFS_DIFLAG_NOATIME) &&
@@ -839,7 +839,7 @@ xfs_init_new_inode( inode->i_atime = tv; inode->i_ctime = tv; - ip->i_d.di_extsize =0 ; + ip->i_extsize =0 ; ip->i_d.di_flags =0 ;if (xfs_sb_version_has_v3inode (&mp->m_sb)) {
fs/xfs/xfs_inode.h +1 -0
@@ -57,6 +57,7 @@ typedef struct xfs_inode {xfs_fsize_t i_disk_size;/* number of bytes in file */ xfs_rfsblock_t i_nblocks;/* # of direct & btree blocks */ prid_t i_projid;/* owner's project id */ +xfs_extlen_t i_extsize;/* basic/minimum extent size */ struct xfs_icdinode i_d;/* most of ondisk inode */
fs/xfs/xfs_inode_item.c +1 -1
@@ -371,7 +371,7 @@ xfs_inode_to_log_dinode( to->di_size = ip->i_disk_size; to->di_nblocks = ip->i_nblocks; - to->di_extsize = from->di_extsize; + 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;
fs/xfs/xfs_ioctl.c +5 -5
@@ -1120,7 +1120,7 @@ xfs_fill_fsxattr(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_extsize = ip->i_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_projid;
@@ -1223,7 +1223,7 @@ xfs_ioctl_setattr_xflags(/* If realtime flag is set then must have realtime device */ if (fa->fsx_xflags &FS_XFLAG_REALTIME ) {if (mp->m_sb.sb_rblocks ==0 || mp->m_sb.sb_rextsize ==0 || - (ip->i_d.di_extsize % mp->m_sb.sb_rextsize)) + (ip->i_extsize % mp->m_sb.sb_rextsize))return -EINVAL ; }
@@ -1347,7 +1347,7 @@ xfs_ioctl_setattr_check_extsize(xfs_fsblock_t extsize_fsb;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)) + ((ip->i_extsize << mp->m_sb.sb_blocklog) != fa->fsx_extsize))return -EINVAL ;if (fa->fsx_extsize ==0 )
@@ -1519,9 +1519,9 @@ xfs_ioctl_setattr(* are set on the inode then unconditionally clear the extent size hint. */ if (ip->i_d.di_flags & (XFS_DIFLAG_EXTSIZE |XFS_DIFLAG_EXTSZINHERIT )) - ip->i_d.di_extsize = fa->fsx_extsize >> mp->m_sb.sb_blocklog; + ip->i_extsize = fa->fsx_extsize >> mp->m_sb.sb_blocklog;else - ip->i_d.di_extsize =0 ; + ip->i_extsize =0 ;if (xfs_sb_version_has_v3inode (&mp->m_sb) && (ip->i_d.di_flags2 &XFS_DIFLAG2_COWEXTSIZE )) ip->i_d.di_cowextsize = fa->fsx_cowextsize >>
fs/xfs/xfs_itable.c +1 -1
@@ -103,7 +103,7 @@ xfs_bulkstat_one_int( buf->bs_mode = inode->i_mode; buf->bs_xflags =xfs_ip2xflags (ip); - buf->bs_extsize_blks = dic->di_extsize; + buf->bs_extsize_blks = ip->i_extsize; buf->bs_extents =xfs_ifork_nextents (&ip->i_df);xfs_bulkstat_health (ip, buf); buf->bs_aextents =xfs_ifork_nextents (ip->i_afp);
Signature · 1 line
2.30.1
PATCH 11/20 xfs: move the di_cowextsize field to struct xfs_inode
In reply to Christoph HellwigIn preparation of removing the historic icinode struct, move the cowextsize field into the containing xfs_inode structure. Also switch to use the xfs_extlen_t instead of a uint32_t.
--- fs/xfs/libxfs/xfs_inode_buf.c | 4 ++-- fs/xfs/libxfs/xfs_inode_buf.h | 1 - fs/xfs/xfs_file.c | 2 +- fs/xfs/xfs_inode.c | 6 +++--- fs/xfs/xfs_inode.h | 1 + fs/xfs/xfs_inode_item.c | 2 +- fs/xfs/xfs_ioctl.c | 8 +++----- fs/xfs/xfs_itable.c | 2 +- fs/xfs/xfs_reflink.c | 2 +- 9 files changed, 13 insertions(+), 15 deletions(-)
fs/xfs/libxfs/xfs_inode_buf.c +2 -2
@@ -240,7 +240,7 @@ xfs_inode_from_disk( be64_to_cpu(from->di_changecount)); to->di_crtime =xfs_inode_from_disk_ts (from, from->di_crtime); to->di_flags2 =be64_to_cpu (from->di_flags2); - to->di_cowextsize =be32_to_cpu (from->di_cowextsize); + ip->i_cowextsize =be32_to_cpu (from->di_cowextsize); } error =xfs_iformat_data_fork (ip, from);
@@ -319,7 +319,7 @@ xfs_inode_to_disk( to->di_changecount =cpu_to_be64 (inode_peek_iversion (inode)); to->di_crtime =xfs_inode_to_disk_ts (ip, from->di_crtime); to->di_flags2 =cpu_to_be64 (from->di_flags2); - to->di_cowextsize =cpu_to_be32 (from->di_cowextsize); + to->di_cowextsize =cpu_to_be32 (ip->i_cowextsize); to->di_ino =cpu_to_be64 (ip->i_ino); to->di_lsn =cpu_to_be64 (lsn);memset (to->di_pad2,0 ,sizeof (to->di_pad2));
fs/xfs/libxfs/xfs_inode_buf.h +0 -1
@@ -21,7 +21,6 @@ struct xfs_icdinode {uint16_t di_flags;/* random flags, XFS_DIFLAG_... */ uint64_t di_flags2;/* more random flags */ -uint32_t di_cowextsize;/* basic cow extent size for file */ struct timespec64 di_crtime;/* time created */ };
fs/xfs/xfs_file.c +1 -1
@@ -1162,7 +1162,7 @@ xfs_file_remap_range( (src->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE) && pos_out == 0 && len >= i_size_read(inode_out) && !(dest->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE)) - cowextsize = src->i_d.di_cowextsize; + cowextsize = src->i_cowextsize; ret =xfs_reflink_update_dest (dest, pos_out + len, cowextsize, remap_flags);
fs/xfs/xfs_inode.c +3 -3
@@ -81,7 +81,7 @@ xfs_get_cowextsz_hint( a =0 ;if (ip->i_d.di_flags2 &XFS_DIFLAG2_COWEXTSIZE ) - a = ip->i_d.di_cowextsize; + a = ip->i_cowextsize; b =xfs_get_extsz_hint (ip); a =max (a, b);
@@ -754,7 +754,7 @@ xfs_inode_inherit_flags2( {if (pip->i_d.di_flags2 &XFS_DIFLAG2_COWEXTSIZE ) { ip->i_d.di_flags2 |=XFS_DIFLAG2_COWEXTSIZE ; - ip->i_d.di_cowextsize = pip->i_d.di_cowextsize; + ip->i_cowextsize = pip->i_cowextsize; }if (pip->i_d.di_flags2 &XFS_DIFLAG2_DAX ) ip->i_d.di_flags2 |=XFS_DIFLAG2_DAX ;
@@ -844,7 +844,7 @@ xfs_init_new_inode(if (xfs_sb_version_has_v3inode (&mp->m_sb)) {inode_set_iversion (inode,1 ); - ip->i_d.di_cowextsize =0 ; + ip->i_cowextsize =0 ; ip->i_d.di_crtime = tv; }
fs/xfs/xfs_inode.h +1 -0
@@ -58,6 +58,7 @@ typedef struct xfs_inode {xfs_rfsblock_t i_nblocks;/* # of direct & btree blocks */ prid_t i_projid;/* owner's project id */ xfs_extlen_t i_extsize;/* basic/minimum extent size */ +xfs_extlen_t i_cowextsize;/* basic cow extent size */ struct xfs_icdinode i_d;/* most of ondisk inode */
fs/xfs/xfs_inode_item.c +1 -1
@@ -388,7 +388,7 @@ xfs_inode_to_log_dinode( to->di_changecount =inode_peek_iversion (inode); to->di_crtime =xfs_inode_to_log_dinode_ts (ip, from->di_crtime); to->di_flags2 = from->di_flags2; - to->di_cowextsize = from->di_cowextsize; + to->di_cowextsize = ip->i_cowextsize; to->di_ino = ip->i_ino; to->di_lsn = lsn;memset (to->di_pad2,0 ,sizeof (to->di_pad2));
fs/xfs/xfs_ioctl.c +3 -5
@@ -1121,8 +1121,7 @@ xfs_fill_fsxattr(simple_fill_fsxattr (fa,xfs_ip2xflags (ip)); fa->fsx_extsize = ip->i_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_cowextsize = ip->i_cowextsize << ip->i_mount->m_sb.sb_blocklog; fa->fsx_projid = ip->i_projid;if (ifp && (ifp->if_flags &XFS_IFEXTENTS )) fa->fsx_nextents =xfs_iext_count (ifp);
@@ -1524,10 +1523,9 @@ xfs_ioctl_setattr( ip->i_extsize =0 ;if (xfs_sb_version_has_v3inode (&mp->m_sb) && (ip->i_d.di_flags2 &XFS_DIFLAG2_COWEXTSIZE )) - ip->i_d.di_cowextsize = fa->fsx_cowextsize >> - mp->m_sb.sb_blocklog; + ip->i_cowextsize = fa->fsx_cowextsize >> mp->m_sb.sb_blocklog;else - ip->i_d.di_cowextsize =0 ; + ip->i_cowextsize =0 ; error =xfs_trans_commit (tp);
fs/xfs/xfs_itable.c +1 -1
@@ -114,7 +114,7 @@ xfs_bulkstat_one_int( buf->bs_btime = dic->di_crtime.tv_sec; buf->bs_btime_nsec = dic->di_crtime.tv_nsec;if (dic->di_flags2 &XFS_DIFLAG2_COWEXTSIZE ) - buf->bs_cowextsize_blks = dic->di_cowextsize; + buf->bs_cowextsize_blks = ip->i_cowextsize; }switch (ip->i_df.if_format) {
fs/xfs/xfs_reflink.c +1 -1
@@ -934,7 +934,7 @@ xfs_reflink_update_dest( }if (cowextsize) { - dest->i_d.di_cowextsize = cowextsize; + dest->i_cowextsize = cowextsize; dest->i_d.di_flags2 |=XFS_DIFLAG2_COWEXTSIZE ; }
Signature · 1 line
2.30.1
PATCH 12/20 xfs: move the di_flushiter field to struct xfs_inode
In reply to Christoph HellwigIn preparation of removing the historic icinode struct, move the flushiter field into the containing xfs_inode structure.
--- fs/xfs/libxfs/xfs_inode_buf.c | 4 ++-- fs/xfs/libxfs/xfs_inode_buf.h | 1 - fs/xfs/xfs_icache.c | 2 +- fs/xfs/xfs_inode.c | 19 +++++++++---------- fs/xfs/xfs_inode.h | 1 + fs/xfs/xfs_inode_item.c | 2 +- 6 files changed, 14 insertions(+), 15 deletions(-)
fs/xfs/libxfs/xfs_inode_buf.c +2 -2
@@ -193,7 +193,7 @@ xfs_inode_from_disk(* inode. If the inode is unused, mode is zero and we shouldn't mess * with the uninitialized part of it. */ - to->di_flushiter =be16_to_cpu (from->di_flushiter); + ip->i_flushiter =be16_to_cpu (from->di_flushiter); inode->i_generation =be32_to_cpu (from->di_gen); inode->i_mode =be16_to_cpu (from->di_mode);if (!inode->i_mode)
@@ -327,7 +327,7 @@ xfs_inode_to_disk( to->di_flushiter =0 ; }else { to->di_version =2 ; - to->di_flushiter =cpu_to_be16 (from->di_flushiter); + to->di_flushiter =cpu_to_be16 (ip->i_flushiter); } }
fs/xfs/libxfs/xfs_inode_buf.h +0 -1
@@ -16,7 +16,6 @@ struct xfs_dinode;* format specific structures at the appropriate time. */ struct xfs_icdinode { -uint16_t di_flushiter;/* incremented on flush */ uint8_t di_forkoff;/* attr fork offs, <<3 for 64b align */ uint16_t di_flags;/* random flags, XFS_DIFLAG_... */
fs/xfs/xfs_icache.c +1 -1
@@ -499,7 +499,7 @@ xfs_iget_cache_miss(* simply build the new inode core with a random generation number. * * For version 4 (and older) superblocks, log recovery is dependent on -* the di_flushiter field being initialised from the current on-disk +* the i_flushiter field being initialised from the current on-disk * value and hence we must also read the inode off disk even when * initializing new inodes. */
fs/xfs/xfs_inode.c +9 -10
@@ -3454,16 +3454,15 @@ xfs_iflush( }/* -* Inode item log recovery for v2 inodes are dependent on the -* di_flushiter count for correct sequencing. We bump the flush -* iteration count so we can detect flushes which postdate a log record -* during recovery. This is redundant as we now log every change and -* hence this can't happen but we need to still do it to ensure -* backwards compatibility with old kernels that predate logging all -* inode changes. +* Inode item log recovery for v2 inodes are dependent on the flushiter +* count for correct sequencing. We bump the flush iteration count so +* we can detect flushes which postdate a log record during recovery. +* This is redundant as we now log every change and hence this can't +* happen but we need to still do it to ensure backwards compatibility +* with old kernels that predate logging all inode changes. */ if (!xfs_sb_version_has_v3inode (&mp->m_sb)) - ip->i_d.di_flushiter++; + ip->i_flushiter++;/* * If there are inline format data / attr forks attached to this inode,
@@ -3484,8 +3483,8 @@ xfs_iflush(xfs_inode_to_disk (ip, dip, iip->ili_item.li_lsn);/* Wrap, we never let the log put out DI_MAX_FLUSH */ -if (ip->i_d.di_flushiter ==DI_MAX_FLUSH ) - ip->i_d.di_flushiter =0 ; +if (ip->i_flushiter ==DI_MAX_FLUSH ) + ip->i_flushiter =0 ;xfs_iflush_fork (ip, dip, iip,XFS_DATA_FORK );if (XFS_IFORK_Q (ip))
fs/xfs/xfs_inode.h +1 -0
@@ -59,6 +59,7 @@ typedef struct xfs_inode {prid_t i_projid;/* owner's project id */ xfs_extlen_t i_extsize;/* basic/minimum extent size */ xfs_extlen_t i_cowextsize;/* basic cow extent size */ +uint16_t i_flushiter;/* incremented on flush */ struct xfs_icdinode i_d;/* most of ondisk inode */
fs/xfs/xfs_inode_item.c +1 -1
@@ -396,7 +396,7 @@ xfs_inode_to_log_dinode( to->di_flushiter =0 ; }else { to->di_version =2 ; - to->di_flushiter = from->di_flushiter; + to->di_flushiter = ip->i_flushiter; } }
Signature · 1 line
2.30.1
PATCH 13/20 xfs: cleanup xfs_fill_fsxattr
In reply to Christoph HellwigAdd a local xfs_mount variable, and use the XFS_FSB_TO_B helper.
--- fs/xfs/xfs_ioctl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/xfs/xfs_ioctl.c +4 -2
@@ -1117,11 +1117,13 @@ xfs_fill_fsxattr(bool attr, struct fsxattr *fa) { + struct xfs_mount *mp = ip->i_mount;struct xfs_ifork *ifp = attr ? ip->i_afp : &ip->i_df;simple_fill_fsxattr (fa,xfs_ip2xflags (ip)); - fa->fsx_extsize = ip->i_extsize << ip->i_mount->m_sb.sb_blocklog; - fa->fsx_cowextsize = ip->i_cowextsize << ip->i_mount->m_sb.sb_blocklog; + + fa->fsx_extsize =XFS_FSB_TO_B (mp, ip->i_extsize); + fa->fsx_cowextsize =XFS_FSB_TO_B (mp, ip->i_cowextsize); fa->fsx_projid = ip->i_projid;if (ifp && (ifp->if_flags &XFS_IFEXTENTS )) fa->fsx_nextents =xfs_iext_count (ifp);
Signature · 1 line
2.30.1
PATCH 14/20 xfs: use XFS_B_TO_FSB in xfs_ioctl_setattr
In reply to Christoph HellwigClean up xfs_ioctl_setattr a bit by using XFS_B_TO_FSB.
--- fs/xfs/xfs_ioctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/xfs/xfs_ioctl.c +2 -2
@@ -1520,12 +1520,12 @@ xfs_ioctl_setattr(* are set on the inode then unconditionally clear the extent size hint. */ if (ip->i_d.di_flags & (XFS_DIFLAG_EXTSIZE |XFS_DIFLAG_EXTSZINHERIT )) - ip->i_extsize = fa->fsx_extsize >> mp->m_sb.sb_blocklog; + ip->i_extsize =XFS_B_TO_FSB (mp, fa->fsx_extsize);else ip->i_extsize =0 ;if (xfs_sb_version_has_v3inode (&mp->m_sb) && (ip->i_d.di_flags2 &XFS_DIFLAG2_COWEXTSIZE )) - ip->i_cowextsize = fa->fsx_cowextsize >> mp->m_sb.sb_blocklog; + ip->i_cowextsize =XFS_B_TO_FSB (mp, fa->fsx_cowextsize);else ip->i_cowextsize =0 ;
Signature · 1 line
2.30.1
Re: [PATCH 14/20] xfs: use XFS_B_TO_FSB in xfs_ioctl_setattr
Quoted 3 lines · Christoph Hellwig
Clean up
xfs_ioctl_setattra bit by usingXFS_B_TO_FSB.Signed-off-by Christoph Hellwig <[email protected]>
Yay!
--D
Quoted 26 lines
--- fs/xfs/xfs_ioctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)fs/xfs/xfs_ioctl.c +2
-2@@ -1520,12 +1520,12 @@ xfs_ioctl_setattr(* are set on the inode then unconditionally clear the extent size hint. */ if (ip->i_d.di_flags & (XFS_DIFLAG_EXTSIZE |XFS_DIFLAG_EXTSZINHERIT )) - ip->i_extsize = fa->fsx_extsize >> mp->m_sb.sb_blocklog; + ip->i_extsize =XFS_B_TO_FSB (mp, fa->fsx_extsize);else ip->i_extsize =0 ;if (xfs_sb_version_has_v3inode (&mp->m_sb) && (ip->i_d.di_flags2 &XFS_DIFLAG2_COWEXTSIZE )) - ip->i_cowextsize = fa->fsx_cowextsize >> mp->m_sb.sb_blocklog; + ip->i_cowextsize =XFS_B_TO_FSB (mp, fa->fsx_cowextsize);else ip->i_cowextsize =0 ;Signature · 1 line
2.30.1
PATCH 15/20 xfs: use a union for i_cowextsize and i_flushiter
In reply to Christoph HellwigThe i_cowextsize field is only used for v3 inodes, and the i_flushiter field is only used for v1/v2 inodes. Use a union to pack the inode a littler better after adding a few missing guards around their usage.
--- fs/xfs/libxfs/xfs_inode_buf.c | 3 ++- fs/xfs/xfs_inode.c | 6 ++++-- fs/xfs/xfs_inode.h | 7 +++++-- fs/xfs/xfs_ioctl.c | 15 +++++++++------ 4 files changed, 20 insertions(+), 11 deletions(-)
fs/xfs/libxfs/xfs_inode_buf.c +2 -1
@@ -193,7 +193,8 @@ xfs_inode_from_disk(* inode. If the inode is unused, mode is zero and we shouldn't mess * with the uninitialized part of it. */ - ip->i_flushiter =be16_to_cpu (from->di_flushiter); +if (!xfs_sb_version_has_v3inode (&ip->i_mount->m_sb)) + ip->i_flushiter =be16_to_cpu (from->di_flushiter); inode->i_generation =be32_to_cpu (from->di_gen); inode->i_mode =be16_to_cpu (from->di_mode);if (!inode->i_mode)
fs/xfs/xfs_inode.c +4 -2
@@ -3483,8 +3483,10 @@ xfs_iflush(xfs_inode_to_disk (ip, dip, iip->ili_item.li_lsn);/* Wrap, we never let the log put out DI_MAX_FLUSH */ -if (ip->i_flushiter ==DI_MAX_FLUSH ) - ip->i_flushiter =0 ; +if (!xfs_sb_version_has_v3inode (&mp->m_sb)) { +if (ip->i_flushiter ==DI_MAX_FLUSH ) + ip->i_flushiter =0 ; + }xfs_iflush_fork (ip, dip, iip,XFS_DATA_FORK );if (XFS_IFORK_Q (ip))
fs/xfs/xfs_inode.h +5 -2
@@ -58,8 +58,11 @@ typedef struct xfs_inode {xfs_rfsblock_t i_nblocks;/* # of direct & btree blocks */ prid_t i_projid;/* owner's project id */ xfs_extlen_t i_extsize;/* basic/minimum extent size */ -xfs_extlen_t i_cowextsize;/* basic cow extent size */ -uint16_t i_flushiter;/* incremented on flush */ +/* cowextsize is only used for v3 inodes, flushiter for v1/2 */ +union { +xfs_extlen_t i_cowextsize;/* basic cow extent size */ +uint16_t i_flushiter;/* incremented on flush */ + };struct xfs_icdinode i_d;/* most of ondisk inode */
fs/xfs/xfs_ioctl.c +9 -6
@@ -1123,7 +1123,8 @@ xfs_fill_fsxattr(simple_fill_fsxattr (fa,xfs_ip2xflags (ip)); fa->fsx_extsize =XFS_FSB_TO_B (mp, ip->i_extsize); - fa->fsx_cowextsize =XFS_FSB_TO_B (mp, ip->i_cowextsize); +if (ip->i_d.di_flags2 &XFS_DIFLAG2_COWEXTSIZE ) + fa->fsx_cowextsize =XFS_FSB_TO_B (mp, ip->i_cowextsize); fa->fsx_projid = ip->i_projid;if (ifp && (ifp->if_flags &XFS_IFEXTENTS )) fa->fsx_nextents =xfs_iext_count (ifp);
@@ -1523,11 +1524,13 @@ xfs_ioctl_setattr( ip->i_extsize =XFS_B_TO_FSB (mp, fa->fsx_extsize); else ip->i_extsize = 0; -if (xfs_sb_version_has_v3inode (&mp->m_sb) && - (ip->i_d.di_flags2 &XFS_DIFLAG2_COWEXTSIZE )) - ip->i_cowextsize =XFS_B_TO_FSB (mp, fa->fsx_cowextsize); -else - ip->i_cowextsize =0 ; + +if (xfs_sb_version_has_v3inode (&mp->m_sb)) { +if (ip->i_d.di_flags2 &XFS_DIFLAG2_COWEXTSIZE ) + ip->i_cowextsize =XFS_B_TO_FSB (mp, fa->fsx_cowextsize); +else + ip->i_cowextsize =0 ; + } error =xfs_trans_commit (tp);
Signature · 1 line
2.30.1
Re: [PATCH 15/20] xfs: use a union for i_cowextsize and i_flushiter
Quoted 5 lines · Christoph Hellwig
The
i_cowextsizefield is only used for v3 inodes, and thei_flushiterfield is only used for v1/v2 inodes. Use a union to pack the inode a littler better after adding a few missing guards around their usage.Signed-off-by Christoph Hellwig <[email protected]>
Looks good to me (and tests ok this time),
--D
Quoted 92 lines
--- fs/xfs/libxfs/xfs_inode_buf.c | 3 ++- fs/xfs/xfs_inode.c | 6 ++++-- fs/xfs/xfs_inode.h | 7 +++++-- fs/xfs/xfs_ioctl.c | 15 +++++++++------ 4 files changed, 20 insertions(+), 11 deletions(-)fs/xfs/libxfs/xfs_inode_buf.c +2
-1@@ -193,7 +193,8 @@ xfs_inode_from_disk(* inode. If the inode is unused, mode is zero and we shouldn't mess * with the uninitialized part of it. */ - ip->i_flushiter =be16_to_cpu (from->di_flushiter); +if (!xfs_sb_version_has_v3inode (&ip->i_mount->m_sb)) + ip->i_flushiter =be16_to_cpu (from->di_flushiter); inode->i_generation =be32_to_cpu (from->di_gen); inode->i_mode =be16_to_cpu (from->di_mode);if (!inode->i_mode)fs/xfs/xfs_inode.c +4
-2@@ -3483,8 +3483,10 @@ xfs_iflush(xfs_inode_to_disk (ip, dip, iip->ili_item.li_lsn);/* Wrap, we never let the log put out DI_MAX_FLUSH */ -if (ip->i_flushiter ==DI_MAX_FLUSH ) - ip->i_flushiter =0 ; +if (!xfs_sb_version_has_v3inode (&mp->m_sb)) { +if (ip->i_flushiter ==DI_MAX_FLUSH ) + ip->i_flushiter =0 ; + }xfs_iflush_fork (ip, dip, iip,XFS_DATA_FORK );if (XFS_IFORK_Q (ip))fs/xfs/xfs_inode.h +5
-2@@ -58,8 +58,11 @@ typedef struct xfs_inode {xfs_rfsblock_t i_nblocks;/* # of direct & btree blocks */ prid_t i_projid;/* owner's project id */ xfs_extlen_t i_extsize;/* basic/minimum extent size */ -xfs_extlen_t i_cowextsize;/* basic cow extent size */ -uint16_t i_flushiter;/* incremented on flush */ +/* cowextsize is only used for v3 inodes, flushiter for v1/2 */ +union { +xfs_extlen_t i_cowextsize;/* basic cow extent size */ +uint16_t i_flushiter;/* incremented on flush */ + };struct xfs_icdinode i_d;/* most of ondisk inode */ fs/xfs/xfs_ioctl.c +9
-6@@ -1123,7 +1123,8 @@ xfs_fill_fsxattr(simple_fill_fsxattr (fa,xfs_ip2xflags (ip)); fa->fsx_extsize =XFS_FSB_TO_B (mp, ip->i_extsize); - fa->fsx_cowextsize =XFS_FSB_TO_B (mp, ip->i_cowextsize); +if (ip->i_d.di_flags2 &XFS_DIFLAG2_COWEXTSIZE ) + fa->fsx_cowextsize =XFS_FSB_TO_B (mp, ip->i_cowextsize); fa->fsx_projid = ip->i_projid;if (ifp && (ifp->if_flags &XFS_IFEXTENTS )) fa->fsx_nextents =xfs_iext_count (ifp);@@ -1523,11 +1524,13 @@ xfs_ioctl_setattr( ip->i_extsize =XFS_B_TO_FSB (mp, fa->fsx_extsize); else ip->i_extsize = 0; -if (xfs_sb_version_has_v3inode (&mp->m_sb) && - (ip->i_d.di_flags2 &XFS_DIFLAG2_COWEXTSIZE )) - ip->i_cowextsize =XFS_B_TO_FSB (mp, fa->fsx_cowextsize); -else - ip->i_cowextsize =0 ; + +if (xfs_sb_version_has_v3inode (&mp->m_sb)) { +if (ip->i_d.di_flags2 &XFS_DIFLAG2_COWEXTSIZE ) + ip->i_cowextsize =XFS_B_TO_FSB (mp, fa->fsx_cowextsize); +else + ip->i_cowextsize =0 ; + } error =xfs_trans_commit (tp);Signature · 1 line
2.30.1
PATCH 16/20 xfs: move the di_forkoff field to struct xfs_inode
In reply to Christoph HellwigIn preparation of removing the historic icinode struct, move the forkoff field into the containing xfs_inode structure.
--- 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 | 10 +++++----- fs/xfs/xfs_inode.h | 1 + fs/xfs/xfs_inode_item.c | 2 +- 9 files changed, 39 insertions(+), 39 deletions(-)
fs/xfs/libxfs/xfs_attr_leaf.c +11 -11
@@ -518,10 +518,10 @@ xfs_attr_copy_value(* Query whether the total requested number of attr fork 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
@@ -560,7 +560,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
@@ -581,7 +581,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 ;
@@ -592,10 +592,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 ;
@@ -730,7 +730,7 @@ xfs_attr_shortform_add( 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 );
@@ -770,7 +770,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 ); }
@@ -821,8 +821,8 @@ xfs_attr_shortform_remove(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) ||
fs/xfs/libxfs/xfs_bmap.c +16 -16
@@ -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; } }
@@ -1038,14 +1038,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 ;
fs/xfs/libxfs/xfs_inode_buf.c +2 -2
@@ -230,7 +230,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_flags =be16_to_cpu (from->di_flags);if (from->di_dmevmask || from->di_dmstate)
@@ -311,7 +311,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_flags =cpu_to_be16 (from->di_flags);
fs/xfs/libxfs/xfs_inode_buf.h +0 -1
@@ -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 */ uint16_t di_flags;/* random flags, XFS_DIFLAG_... */ uint64_t di_flags2;/* more random flags */
fs/xfs/libxfs/xfs_inode_fork.h +2 -2
@@ -99,8 +99,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 ? \
fs/xfs/xfs_icache.c +1 -1
@@ -65,7 +65,7 @@ xfs_inode_alloc( ip->i_delayed_blks =0 ; ip->i_d.di_flags2 = mp->m_ino_geo.new_diflags2; 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);
fs/xfs/xfs_inode.c +5 -5
@@ -885,7 +885,7 @@ xfs_init_new_inode(* fork offset in the immediate future. */ if (init_xattrs) { - ip->i_d.di_forkoff =xfs_default_attroffset (ip) >>3 ; + ip->i_forkoff =xfs_default_attroffset (ip) >>3 ; ip->i_afp =xfs_ifork_alloc (XFS_DINODE_FMT_EXTENTS ,0 ); }
@@ -1764,7 +1764,7 @@ xfs_inactive( }ASSERT (!ip->i_afp); -ASSERT (ip->i_d.di_forkoff ==0 ); +ASSERT (ip->i_forkoff ==0 );/* * Free the inode.
@@ -2613,7 +2613,7 @@ xfs_ifree(VFS_I (ip)->i_mode =0 ;/* mark incore inode as free */ ip->i_d.di_flags =0 ; ip->i_d.di_flags2 = ip->i_mount->m_ino_geo.new_diflags2; - 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 ;if (xfs_iflags_test (ip,XFS_IPRESERVE_DM_FIELDS ))xfs_iflags_clear (ip,XFS_IPRESERVE_DM_FIELDS );
@@ -3445,11 +3445,11 @@ xfs_iflush( 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; }
fs/xfs/xfs_inode.h +1 -0
@@ -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 */
fs/xfs/xfs_inode_item.c +1 -1
@@ -374,7 +374,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_flags = from->di_flags;
Signature · 1 line
2.30.1
PATCH 17/20 xfs: move the di_flags field to struct xfs_inode
In reply to Christoph HellwigIn preparation of removing the historic icinode struct, move the flags field into the containing xfs_inode structure.
--- fs/xfs/libxfs/xfs_bmap_btree.c | 2 +- fs/xfs/libxfs/xfs_inode_buf.c | 4 ++-- fs/xfs/libxfs/xfs_inode_buf.h | 2 -- fs/xfs/libxfs/xfs_rtbitmap.c | 4 ++-- fs/xfs/scrub/common.c | 2 +- fs/xfs/xfs_bmap_util.c | 4 ++-- fs/xfs/xfs_file.c | 4 ++-- fs/xfs/xfs_filestream.h | 2 +- fs/xfs/xfs_inode.c | 38 +++++++++++++++++----------------- fs/xfs/xfs_inode.h | 3 ++- fs/xfs/xfs_inode_item.c | 2 +- fs/xfs/xfs_ioctl.c | 8 +++---- fs/xfs/xfs_iops.c | 6 +++--- fs/xfs/xfs_linux.h | 2 +- fs/xfs/xfs_rtalloc.c | 4 ++-- fs/xfs/xfs_super.c | 4 ++-- fs/xfs/xfs_symlink.c | 2 +- 17 files changed, 46 insertions(+), 47 deletions(-)
fs/xfs/libxfs/xfs_bmap_btree.c +1 -1
@@ -183,7 +183,7 @@ xfs_bmbt_update_cursor( struct xfs_btree_cur *dst) {ASSERT ((dst->bc_tp->t_firstblock !=NULLFSBLOCK ) || - (dst->bc_ino.ip->i_d.di_flags &XFS_DIFLAG_REALTIME )); + (dst->bc_ino.ip->i_diflags &XFS_DIFLAG_REALTIME )); dst->bc_ino.allocated += src->bc_ino.allocated; dst->bc_tp->t_firstblock = src->bc_tp->t_firstblock;
fs/xfs/libxfs/xfs_inode_buf.c +2 -2
@@ -231,7 +231,7 @@ xfs_inode_from_disk( ip->i_nblocks =be64_to_cpu (from->di_nblocks); ip->i_extsize =be32_to_cpu (from->di_extsize); ip->i_forkoff = from->di_forkoff; - to->di_flags =be16_to_cpu (from->di_flags); + ip->i_diflags =be16_to_cpu (from->di_flags);if (from->di_dmevmask || from->di_dmstate)xfs_iflags_set (ip,XFS_IPRESERVE_DM_FIELDS );
@@ -313,7 +313,7 @@ xfs_inode_to_disk( to->di_anextents =cpu_to_be16 (xfs_ifork_nextents (ip->i_afp)); to->di_forkoff = ip->i_forkoff; to->di_aformat =xfs_ifork_format (ip->i_afp); - to->di_flags =cpu_to_be16 (from->di_flags); + to->di_flags =cpu_to_be16 (ip->i_diflags);if (xfs_sb_version_has_v3inode (&ip->i_mount->m_sb)) { to->di_version =3 ;
fs/xfs/libxfs/xfs_inode_buf.h +0 -2
@@ -16,8 +16,6 @@ struct xfs_dinode;* format specific structures at the appropriate time. */ struct xfs_icdinode { -uint16_t di_flags;/* random flags, XFS_DIFLAG_... */ -uint64_t di_flags2;/* more random flags */ struct timespec64 di_crtime;/* time created */
fs/xfs/libxfs/xfs_rtbitmap.c +2 -2
@@ -997,8 +997,8 @@ xfs_rtfree_extent(*/ if (tp->t_frextents_delta + mp->m_sb.sb_frextents == mp->m_sb.sb_rextents) { -if (!(mp->m_rbmip->i_d.di_flags &XFS_DIFLAG_NEWRTBM )) - mp->m_rbmip->i_d.di_flags |=XFS_DIFLAG_NEWRTBM ; +if (!(mp->m_rbmip->i_diflags &XFS_DIFLAG_NEWRTBM )) + mp->m_rbmip->i_diflags |=XFS_DIFLAG_NEWRTBM ; *(uint64_t *)&VFS_I (mp->m_rbmip)->i_atime =0 ;xfs_trans_log_inode (tp, mp->m_rbmip,XFS_ILOG_CORE ); }
fs/xfs/scrub/common.c +1 -1
@@ -818,7 +818,7 @@ xchk_metadata_inode_forks(return 0 ;/* Metadata inodes don't live on the rt device. */ -if (sc->ip->i_d.di_flags &XFS_DIFLAG_REALTIME ) { +if (sc->ip->i_diflags &XFS_DIFLAG_REALTIME ) {xchk_ino_set_corrupt (sc, sc->ip->i_ino);return 0 ; }
fs/xfs/xfs_bmap_util.c +2 -2
@@ -439,7 +439,7 @@ xfs_getbmap( }if (xfs_get_extsz_hint (ip) || - (ip->i_d.di_flags & + (ip->i_diflags & (XFS_DIFLAG_PREALLOC |XFS_DIFLAG_APPEND ))) max_len = mp->m_super->s_maxbytes;else
@@ -620,7 +620,7 @@ xfs_can_free_eofblocks(struct xfs_inode *ip, bool force)* Do not free real preallocated or append-only files unless the file * has delalloc blocks and we are forced to remove them. */ -if (ip->i_d.di_flags & (XFS_DIFLAG_PREALLOC |XFS_DIFLAG_APPEND )) +if (ip->i_diflags & (XFS_DIFLAG_PREALLOC |XFS_DIFLAG_APPEND ))if (!force || ip->i_delayed_blks ==0 )return false;
fs/xfs/xfs_file.c +2 -2
@@ -90,9 +90,9 @@ xfs_update_prealloc_flags( }if (flags &XFS_PREALLOC_SET ) - ip->i_d.di_flags |=XFS_DIFLAG_PREALLOC ; + ip->i_diflags |=XFS_DIFLAG_PREALLOC ;if (flags &XFS_PREALLOC_CLEAR ) - ip->i_d.di_flags &= ~XFS_DIFLAG_PREALLOC ; + ip->i_diflags &= ~XFS_DIFLAG_PREALLOC ;xfs_trans_log_inode (tp, ip,XFS_ILOG_CORE );if (flags &XFS_PREALLOC_SYNC )
fs/xfs/xfs_filestream.h +1 -1
@@ -22,7 +22,7 @@ xfs_inode_is_filestream( struct xfs_inode *ip) {return (ip->i_mount->m_flags &XFS_MOUNT_FILESTREAMS ) || - (ip->i_d.di_flags &XFS_DIFLAG_FILESTREAM ); + (ip->i_diflags &XFS_DIFLAG_FILESTREAM ); }#endif /* __XFS_FILESTREAM_H__ */
fs/xfs/xfs_inode.c +19 -19
@@ -60,7 +60,7 @@ xfs_get_extsz_hint(*/ if (xfs_is_always_cow_inode (ip))return 0 ; -if ((ip->i_d.di_flags &XFS_DIFLAG_EXTSIZE ) && ip->i_extsize) +if ((ip->i_diflags &XFS_DIFLAG_EXTSIZE ) && ip->i_extsize)return ip->i_extsize;if (XFS_IS_REALTIME_INODE (ip))return ip->i_mount->m_sb.sb_rextsize;
@@ -656,7 +656,7 @@ xfs_ip2xflags( {struct xfs_icdinode *dic = &ip->i_d; -return _xfs_dic2xflags (dic->di_flags, dic->di_flags2,XFS_IFORK_Q (ip)); +return _xfs_dic2xflags (ip->i_diflags, dic->di_flags2,XFS_IFORK_Q (ip)); }/*
@@ -708,42 +708,42 @@ xfs_inode_inherit_flags(umode_t mode =VFS_I (ip)->i_mode;if (S_ISDIR (mode)) { -if (pip->i_d.di_flags &XFS_DIFLAG_RTINHERIT ) +if (pip->i_diflags &XFS_DIFLAG_RTINHERIT ) di_flags |=XFS_DIFLAG_RTINHERIT ; -if (pip->i_d.di_flags &XFS_DIFLAG_EXTSZINHERIT ) { +if (pip->i_diflags &XFS_DIFLAG_EXTSZINHERIT ) { di_flags |=XFS_DIFLAG_EXTSZINHERIT ; ip->i_extsize = pip->i_extsize; } -if (pip->i_d.di_flags &XFS_DIFLAG_PROJINHERIT ) +if (pip->i_diflags &XFS_DIFLAG_PROJINHERIT ) di_flags |=XFS_DIFLAG_PROJINHERIT ; }else if (S_ISREG (mode)) { -if ((pip->i_d.di_flags &XFS_DIFLAG_RTINHERIT ) && +if ((pip->i_diflags &XFS_DIFLAG_RTINHERIT ) &&xfs_sb_version_hasrealtime (&ip->i_mount->m_sb)) di_flags |=XFS_DIFLAG_REALTIME ; -if (pip->i_d.di_flags &XFS_DIFLAG_EXTSZINHERIT ) { +if (pip->i_diflags &XFS_DIFLAG_EXTSZINHERIT ) { di_flags |=XFS_DIFLAG_EXTSIZE ; ip->i_extsize = pip->i_extsize; } } -if ((pip->i_d.di_flags &XFS_DIFLAG_NOATIME ) && +if ((pip->i_diflags &XFS_DIFLAG_NOATIME ) && xfs_inherit_noatime) di_flags |=XFS_DIFLAG_NOATIME ; -if ((pip->i_d.di_flags &XFS_DIFLAG_NODUMP ) && +if ((pip->i_diflags &XFS_DIFLAG_NODUMP ) && xfs_inherit_nodump) di_flags |=XFS_DIFLAG_NODUMP ; -if ((pip->i_d.di_flags &XFS_DIFLAG_SYNC ) && +if ((pip->i_diflags &XFS_DIFLAG_SYNC ) && xfs_inherit_sync) di_flags |=XFS_DIFLAG_SYNC ; -if ((pip->i_d.di_flags &XFS_DIFLAG_NOSYMLINKS ) && +if ((pip->i_diflags &XFS_DIFLAG_NOSYMLINKS ) && xfs_inherit_nosymlinks) di_flags |=XFS_DIFLAG_NOSYMLINKS ; -if ((pip->i_d.di_flags &XFS_DIFLAG_NODEFRAG ) && +if ((pip->i_diflags &XFS_DIFLAG_NODEFRAG ) && xfs_inherit_nodefrag) di_flags |=XFS_DIFLAG_NODEFRAG ; -if (pip->i_d.di_flags &XFS_DIFLAG_FILESTREAM ) +if (pip->i_diflags &XFS_DIFLAG_FILESTREAM ) di_flags |=XFS_DIFLAG_FILESTREAM ; - ip->i_d.di_flags |= di_flags; + ip->i_diflags |= di_flags; }/* Propagate di_flags2 from a parent inode to a child inode. */
@@ -840,7 +840,7 @@ xfs_init_new_inode( inode->i_ctime = tv; ip->i_extsize =0 ; - ip->i_d.di_flags =0 ; + ip->i_diflags =0 ;if (xfs_sb_version_has_v3inode (&mp->m_sb)) {inode_set_iversion (inode,1 );
@@ -860,7 +860,7 @@ xfs_init_new_inode(break ;case S_IFREG :case S_IFDIR : -if (pip && (pip->i_d.di_flags &XFS_DIFLAG_ANY )) +if (pip && (pip->i_diflags &XFS_DIFLAG_ANY ))xfs_inode_inherit_flags (ip, pip);if (pip && (pip->i_d.di_flags2 &XFS_DIFLAG2_ANY ))xfs_inode_inherit_flags2 (ip, pip);
@@ -1287,7 +1287,7 @@ xfs_link(* creation in our tree when the project IDs are the same; else * the tree quota mechanism could be circumvented. */ -if (unlikely ((tdp->i_d.di_flags &XFS_DIFLAG_PROJINHERIT ) && +if (unlikely ((tdp->i_diflags &XFS_DIFLAG_PROJINHERIT ) && tdp->i_projid != sip->i_projid)) { error = -EXDEV ; goto error_return;
@@ -2611,7 +2611,7 @@ xfs_ifree( }VFS_I (ip)->i_mode =0 ;/* mark incore inode as free */ - ip->i_d.di_flags =0 ; + ip->i_diflags =0 ; ip->i_d.di_flags2 = ip->i_mount->m_ino_geo.new_diflags2; ip->i_forkoff =0 ;/* mark the attr fork not in use */ ip->i_df.if_format =XFS_DINODE_FMT_EXTENTS ;
@@ -3125,7 +3125,7 @@ xfs_rename(* into our tree when the project IDs are the same; else the * tree quota mechanism would be circumvented. */ -if (unlikely ((target_dp->i_d.di_flags &XFS_DIFLAG_PROJINHERIT ) && +if (unlikely ((target_dp->i_diflags &XFS_DIFLAG_PROJINHERIT ) && target_dp->i_projid != src_ip->i_projid)) { error = -EXDEV ; goto out_trans_cancel;
fs/xfs/xfs_inode.h +2 -1
@@ -64,6 +64,7 @@ typedef struct xfs_inode {uint16_t i_flushiter;/* incremented on flush */ };uint8_t i_forkoff;/* attr fork offset >> 3 */ +uint16_t i_diflags;/* XFS_DIFLAG_... */ struct xfs_icdinode i_d;/* most of ondisk inode */
@@ -184,7 +185,7 @@ xfs_iflags_test_and_set(xfs_inode_t *ip, unsigned short flags)static inline prid_t xfs_get_initial_prid (struct xfs_inode *dp) { -if (dp->i_d.di_flags &XFS_DIFLAG_PROJINHERIT ) +if (dp->i_diflags &XFS_DIFLAG_PROJINHERIT )return dp->i_projid;return XFS_PROJID_DEFAULT ;
fs/xfs/xfs_inode_item.c +1 -1
@@ -376,7 +376,7 @@ xfs_inode_to_log_dinode( to->di_anextents =xfs_ifork_nextents (ip->i_afp); to->di_forkoff = ip->i_forkoff; to->di_aformat =xfs_ifork_format (ip->i_afp); - to->di_flags = from->di_flags; + to->di_flags = ip->i_diflags;xfs_copy_dm_fields_to_log_dinode (ip, to);
fs/xfs/xfs_ioctl.c +4 -4
@@ -1156,7 +1156,7 @@ xfs_flags2diflags( {/* can't set PREALLOC this way, just preserve it */ uint16_t di_flags = - (ip->i_d.di_flags &XFS_DIFLAG_PREALLOC ); + (ip->i_diflags &XFS_DIFLAG_PREALLOC );if (xflags &FS_XFLAG_IMMUTABLE ) di_flags |=XFS_DIFLAG_IMMUTABLE ;
@@ -1242,7 +1242,7 @@ xfs_ioctl_setattr_xflags(if (di_flags2 && !xfs_sb_version_has_v3inode (&mp->m_sb))return -EINVAL ; - ip->i_d.di_flags =xfs_flags2diflags (ip, fa->fsx_xflags); + ip->i_diflags =xfs_flags2diflags (ip, fa->fsx_xflags); ip->i_d.di_flags2 = di_flags2;xfs_diflags_to_iflags (ip, false);
@@ -1520,7 +1520,7 @@ xfs_ioctl_setattr(* extent size hint should be set on the inode. If no extent size flags * are set on the inode then unconditionally clear the extent size hint. */ -if (ip->i_d.di_flags & (XFS_DIFLAG_EXTSIZE |XFS_DIFLAG_EXTSZINHERIT )) +if (ip->i_diflags & (XFS_DIFLAG_EXTSIZE |XFS_DIFLAG_EXTSZINHERIT )) ip->i_extsize =XFS_B_TO_FSB (mp, fa->fsx_extsize);else ip->i_extsize =0 ;
@@ -1575,7 +1575,7 @@ xfs_ioc_getxflags( {unsigned int flags; - flags =xfs_di2lxflags (ip->i_d.di_flags, ip->i_d.di_flags2); + flags =xfs_di2lxflags (ip->i_diflags, ip->i_d.di_flags2);if (copy_to_user (arg, &flags,sizeof (flags)))return -EFAULT ;return 0 ;
fs/xfs/xfs_iops.c +3 -3
@@ -607,11 +607,11 @@ xfs_vn_getattr(* Note: If you add another clause to set an attribute flag, please * update attributes_mask below. */ -if (ip->i_d.di_flags &XFS_DIFLAG_IMMUTABLE ) +if (ip->i_diflags &XFS_DIFLAG_IMMUTABLE ) stat->attributes |=STATX_ATTR_IMMUTABLE ; -if (ip->i_d.di_flags &XFS_DIFLAG_APPEND ) +if (ip->i_diflags &XFS_DIFLAG_APPEND ) stat->attributes |=STATX_ATTR_APPEND ; -if (ip->i_d.di_flags &XFS_DIFLAG_NODUMP ) +if (ip->i_diflags &XFS_DIFLAG_NODUMP ) stat->attributes |=STATX_ATTR_NODUMP ; stat->attributes_mask |= (STATX_ATTR_IMMUTABLE |
fs/xfs/xfs_linux.h +1 -1
@@ -233,7 +233,7 @@ int xfs_rw_bdev(struct block_device *bdev, sector_t sector, unsigned int count,* configured realtime device. */ #define XFS_IS_REALTIME_INODE (ip) \ - (((ip)->i_d.di_flags & XFS_DIFLAG_REALTIME) && \ + (((ip)->i_diflags & XFS_DIFLAG_REALTIME) && \ (ip)->i_mount->m_rtdev_targp)#define XFS_IS_REALTIME_MOUNT (mp) ((mp)->m_rtdev_targp ? 1 : 0)#else
fs/xfs/xfs_rtalloc.c +2 -2
@@ -1318,8 +1318,8 @@ xfs_rtpick_extent(ASSERT (xfs_isilocked (mp->m_rbmip,XFS_ILOCK_EXCL )); seqp = (uint64_t *)&VFS_I (mp->m_rbmip)->i_atime; -if (!(mp->m_rbmip->i_d.di_flags &XFS_DIFLAG_NEWRTBM )) { - mp->m_rbmip->i_d.di_flags |=XFS_DIFLAG_NEWRTBM ; +if (!(mp->m_rbmip->i_diflags &XFS_DIFLAG_NEWRTBM )) { + mp->m_rbmip->i_diflags |=XFS_DIFLAG_NEWRTBM ; *seqp =0 ; } seq = *seqp;
fs/xfs/xfs_super.c +2 -2
@@ -834,13 +834,13 @@ xfs_fs_statfs( statp->f_ffree =max_t (int64_t, ffree,0 ); -if ((ip->i_d.di_flags &XFS_DIFLAG_PROJINHERIT ) && +if ((ip->i_diflags &XFS_DIFLAG_PROJINHERIT ) && ((mp->m_qflags & (XFS_PQUOTA_ACCT |XFS_PQUOTA_ENFD ))) == (XFS_PQUOTA_ACCT |XFS_PQUOTA_ENFD ))xfs_qm_statvfs (ip, statp);if (XFS_IS_REALTIME_MOUNT (mp) && - (ip->i_d.di_flags & (XFS_DIFLAG_RTINHERIT |XFS_DIFLAG_REALTIME ))) { + (ip->i_diflags & (XFS_DIFLAG_RTINHERIT |XFS_DIFLAG_REALTIME ))) { statp->f_blocks = sbp->sb_rblocks; statp->f_bavail = statp->f_bfree = sbp->sb_frextents * sbp->sb_rextsize;
fs/xfs/xfs_symlink.c +1 -1
@@ -210,7 +210,7 @@ xfs_symlink(/* * Check whether the directory allows new symlinks or not. */ -if (dp->i_d.di_flags &XFS_DIFLAG_NOSYMLINKS ) { +if (dp->i_diflags &XFS_DIFLAG_NOSYMLINKS ) { error = -EPERM ; goto out_trans_cancel; }
Signature · 1 line
2.30.1
PATCH 18/20 xfs: move the di_flags2 field to struct xfs_inode
In reply to Christoph HellwigIn preparation of removing the historic icinode struct, move the flags2 field into the containing xfs_inode structure.
--- fs/xfs/libxfs/xfs_inode_buf.c | 4 ++-- fs/xfs/libxfs/xfs_inode_buf.h | 2 -- fs/xfs/libxfs/xfs_trans_inode.c | 2 +- fs/xfs/xfs_bmap_util.c | 24 ++++++++++++------------ fs/xfs/xfs_file.c | 4 ++-- fs/xfs/xfs_icache.c | 2 +- fs/xfs/xfs_inode.c | 20 +++++++++----------- fs/xfs/xfs_inode.h | 5 +++-- fs/xfs/xfs_inode_item.c | 2 +- fs/xfs/xfs_ioctl.c | 24 ++++++++++++------------ fs/xfs/xfs_iops.c | 2 +- fs/xfs/xfs_itable.c | 2 +- fs/xfs/xfs_reflink.c | 8 ++++---- 13 files changed, 49 insertions(+), 52 deletions(-)
fs/xfs/libxfs/xfs_inode_buf.c +2 -2
@@ -240,7 +240,7 @@ xfs_inode_from_disk(inode_set_iversion_queried (inode,be64_to_cpu (from->di_changecount)); to->di_crtime =xfs_inode_from_disk_ts (from, from->di_crtime); - to->di_flags2 =be64_to_cpu (from->di_flags2); + ip->i_diflags2 =be64_to_cpu (from->di_flags2); ip->i_cowextsize =be32_to_cpu (from->di_cowextsize); }
@@ -319,7 +319,7 @@ xfs_inode_to_disk( to->di_version =3 ; to->di_changecount =cpu_to_be64 (inode_peek_iversion (inode)); to->di_crtime =xfs_inode_to_disk_ts (ip, from->di_crtime); - to->di_flags2 =cpu_to_be64 (from->di_flags2); + to->di_flags2 =cpu_to_be64 (ip->i_diflags2); to->di_cowextsize =cpu_to_be32 (ip->i_cowextsize); to->di_ino =cpu_to_be64 (ip->i_ino); to->di_lsn =cpu_to_be64 (lsn);
fs/xfs/libxfs/xfs_inode_buf.h +0 -2
@@ -16,8 +16,6 @@ struct xfs_dinode;* format specific structures at the appropriate time. */ struct xfs_icdinode { -uint64_t di_flags2;/* more random flags */ -struct timespec64 di_crtime;/* time created */ };
fs/xfs/libxfs/xfs_trans_inode.c +1 -1
@@ -138,7 +138,7 @@ xfs_trans_log_inode(if ((flags & (XFS_ILOG_CORE |XFS_ILOG_TIMESTAMP )) &&xfs_sb_version_hasbigtime (&ip->i_mount->m_sb) && !xfs_inode_has_bigtime (ip)) { - ip->i_d.di_flags2 |=XFS_DIFLAG2_BIGTIME ; + ip->i_diflags2 |=XFS_DIFLAG2_BIGTIME ; flags |=XFS_ILOG_CORE ; }
fs/xfs/xfs_bmap_util.c +12 -12
@@ -1323,9 +1323,9 @@ xfs_swap_extent_rmap(* rmap functions when we go to fix up the rmaps. The flags * will be switch for reals later. */ - tip_flags2 = tip->i_d.di_flags2; -if (ip->i_d.di_flags2 &XFS_DIFLAG2_REFLINK ) - tip->i_d.di_flags2 |=XFS_DIFLAG2_REFLINK ; + tip_flags2 = tip->i_diflags2; +if (ip->i_diflags2 &XFS_DIFLAG2_REFLINK ) + tip->i_diflags2 |=XFS_DIFLAG2_REFLINK ; offset_fsb =0 ; end_fsb =XFS_B_TO_FSB (ip->i_mount,i_size_read (VFS_I (ip)));
@@ -1412,12 +1412,12 @@ xfs_swap_extent_rmap( offset_fsb += ilen; } - tip->i_d.di_flags2 = tip_flags2; + tip->i_diflags2 = tip_flags2;return 0 ; out:trace_xfs_swap_extent_rmap_error (ip, error, _RET_IP_); - tip->i_d.di_flags2 = tip_flags2; + tip->i_diflags2 = tip_flags2;return error; }
@@ -1715,13 +1715,13 @@ xfs_swap_extents( goto out_trans_cancel;/* Do we have to swap reflink flags? */ -if ((ip->i_d.di_flags2 &XFS_DIFLAG2_REFLINK ) ^ - (tip->i_d.di_flags2 &XFS_DIFLAG2_REFLINK )) { - f = ip->i_d.di_flags2 &XFS_DIFLAG2_REFLINK ; - ip->i_d.di_flags2 &= ~XFS_DIFLAG2_REFLINK ; - ip->i_d.di_flags2 |= tip->i_d.di_flags2 &XFS_DIFLAG2_REFLINK ; - tip->i_d.di_flags2 &= ~XFS_DIFLAG2_REFLINK ; - tip->i_d.di_flags2 |= f &XFS_DIFLAG2_REFLINK ; +if ((ip->i_diflags2 &XFS_DIFLAG2_REFLINK ) ^ + (tip->i_diflags2 &XFS_DIFLAG2_REFLINK )) { + f = ip->i_diflags2 &XFS_DIFLAG2_REFLINK ; + ip->i_diflags2 &= ~XFS_DIFLAG2_REFLINK ; + ip->i_diflags2 |= tip->i_diflags2 &XFS_DIFLAG2_REFLINK ; + tip->i_diflags2 &= ~XFS_DIFLAG2_REFLINK ; + tip->i_diflags2 |= f &XFS_DIFLAG2_REFLINK ; }/* Swap the cow forks. */
fs/xfs/xfs_file.c +2 -2
@@ -1159,9 +1159,9 @@ xfs_file_remap_range(*/ cowextsize =0 ;if (pos_in ==0 && len ==i_size_read (inode_in) && - (src->i_d.di_flags2 &XFS_DIFLAG2_COWEXTSIZE ) && + (src->i_diflags2 &XFS_DIFLAG2_COWEXTSIZE ) && pos_out ==0 && len >=i_size_read (inode_out) && - !(dest->i_d.di_flags2 &XFS_DIFLAG2_COWEXTSIZE )) + !(dest->i_diflags2 &XFS_DIFLAG2_COWEXTSIZE )) cowextsize = src->i_cowextsize; ret = xfs_reflink_update_dest(dest, pos_out + len, cowextsize,
fs/xfs/xfs_icache.c +1 -1
@@ -63,7 +63,7 @@ xfs_inode_alloc(memset (&ip->i_df,0 ,sizeof (ip->i_df)); ip->i_flags =0 ; ip->i_delayed_blks =0 ; - ip->i_d.di_flags2 = mp->m_ino_geo.new_diflags2; + ip->i_diflags2 = mp->m_ino_geo.new_diflags2; ip->i_nblocks =0 ; ip->i_forkoff =0 ; ip->i_sick =0 ;
fs/xfs/xfs_inode.c +9 -11
@@ -80,7 +80,7 @@ xfs_get_cowextsz_hint(xfs_extlen_t a, b; a =0 ; -if (ip->i_d.di_flags2 &XFS_DIFLAG2_COWEXTSIZE ) +if (ip->i_diflags2 &XFS_DIFLAG2_COWEXTSIZE ) a = ip->i_cowextsize; b =xfs_get_extsz_hint (ip);
@@ -654,9 +654,7 @@ uintxfs_ip2xflags ( struct xfs_inode *ip) { -struct xfs_icdinode *dic = &ip->i_d; - -return _xfs_dic2xflags (ip->i_diflags, dic->di_flags2,XFS_IFORK_Q (ip)); +return _xfs_dic2xflags (ip->i_diflags, ip->i_diflags2,XFS_IFORK_Q (ip)); }/*
@@ -752,12 +750,12 @@ xfs_inode_inherit_flags2( struct xfs_inode *ip, const struct xfs_inode *pip) { -if (pip->i_d.di_flags2 &XFS_DIFLAG2_COWEXTSIZE ) { - ip->i_d.di_flags2 |=XFS_DIFLAG2_COWEXTSIZE ; +if (pip->i_diflags2 &XFS_DIFLAG2_COWEXTSIZE ) { + ip->i_diflags2 |=XFS_DIFLAG2_COWEXTSIZE ; ip->i_cowextsize = pip->i_cowextsize; } -if (pip->i_d.di_flags2 &XFS_DIFLAG2_DAX ) - ip->i_d.di_flags2 |=XFS_DIFLAG2_DAX ; +if (pip->i_diflags2 &XFS_DIFLAG2_DAX ) + ip->i_diflags2 |=XFS_DIFLAG2_DAX ; }/*
@@ -862,7 +860,7 @@ xfs_init_new_inode(case S_IFDIR :if (pip && (pip->i_diflags &XFS_DIFLAG_ANY ))xfs_inode_inherit_flags (ip, pip); -if (pip && (pip->i_d.di_flags2 &XFS_DIFLAG2_ANY )) +if (pip && (pip->i_diflags2 &XFS_DIFLAG2_ANY ))xfs_inode_inherit_flags2 (ip, pip);/* FALLTHROUGH */ case S_IFLNK :
@@ -1346,7 +1344,7 @@ xfs_itruncate_clear_reflink_flags( dfork =XFS_IFORK_PTR (ip,XFS_DATA_FORK ); cfork =XFS_IFORK_PTR (ip,XFS_COW_FORK );if (dfork->if_bytes ==0 && cfork->if_bytes ==0 ) - ip->i_d.di_flags2 &= ~XFS_DIFLAG2_REFLINK ; + ip->i_diflags2 &= ~XFS_DIFLAG2_REFLINK ;if (cfork->if_bytes ==0 )xfs_inode_clear_cowblocks_tag (ip); }
@@ -2612,7 +2610,7 @@ xfs_ifree(VFS_I (ip)->i_mode =0 ;/* mark incore inode as free */ ip->i_diflags =0 ; - ip->i_d.di_flags2 = ip->i_mount->m_ino_geo.new_diflags2; + ip->i_diflags2 = ip->i_mount->m_ino_geo.new_diflags2; ip->i_forkoff =0 ;/* mark the attr fork not in use */ ip->i_df.if_format =XFS_DINODE_FMT_EXTENTS ;if (xfs_iflags_test (ip,XFS_IPRESERVE_DM_FIELDS ))
fs/xfs/xfs_inode.h +3 -2
@@ -65,6 +65,7 @@ typedef struct xfs_inode { };uint8_t i_forkoff;/* attr fork offset >> 3 */ uint16_t i_diflags;/* XFS_DIFLAG_... */ +uint64_t i_diflags2;/* XFS_DIFLAG2_... */ struct xfs_icdinode i_d;/* most of ondisk inode */
@@ -193,7 +194,7 @@ xfs_get_initial_prid(struct xfs_inode *dp)static inline bool xfs_is_reflink_inode (struct xfs_inode *ip) { -return ip->i_d.di_flags2 &XFS_DIFLAG2_REFLINK ; +return ip->i_diflags2 &XFS_DIFLAG2_REFLINK ; }static inline bool xfs_is_metadata_inode (struct xfs_inode *ip)
@@ -215,7 +216,7 @@ static inline bool xfs_inode_has_cow_data(struct xfs_inode *ip)static inline bool xfs_inode_has_bigtime (struct xfs_inode *ip) { -return ip->i_d.di_flags2 &XFS_DIFLAG2_BIGTIME ; +return ip->i_diflags2 &XFS_DIFLAG2_BIGTIME ; }/*
fs/xfs/xfs_inode_item.c +1 -1
@@ -387,7 +387,7 @@ xfs_inode_to_log_dinode( to->di_version =3 ; to->di_changecount =inode_peek_iversion (inode); to->di_crtime =xfs_inode_to_log_dinode_ts (ip, from->di_crtime); - to->di_flags2 = from->di_flags2; + to->di_flags2 = ip->i_diflags2; to->di_cowextsize = ip->i_cowextsize; to->di_ino = ip->i_ino; to->di_lsn = lsn;
fs/xfs/xfs_ioctl.c +12 -12
@@ -1123,7 +1123,7 @@ xfs_fill_fsxattr(simple_fill_fsxattr (fa,xfs_ip2xflags (ip)); fa->fsx_extsize =XFS_FSB_TO_B (mp, ip->i_extsize); -if (ip->i_d.di_flags2 &XFS_DIFLAG2_COWEXTSIZE ) +if (ip->i_diflags2 &XFS_DIFLAG2_COWEXTSIZE ) fa->fsx_cowextsize =XFS_FSB_TO_B (mp, ip->i_cowextsize); fa->fsx_projid = ip->i_projid;if (ifp && (ifp->if_flags &XFS_IFEXTENTS ))
@@ -1197,8 +1197,8 @@ xfs_flags2diflags2( unsigned int xflags) {uint64_t di_flags2 = - (ip->i_d.di_flags2 & (XFS_DIFLAG2_REFLINK | -XFS_DIFLAG2_BIGTIME )); + (ip->i_diflags2 & (XFS_DIFLAG2_REFLINK | +XFS_DIFLAG2_BIGTIME ));if (xflags &FS_XFLAG_DAX ) di_flags2 |=XFS_DIFLAG2_DAX ;
@@ -1215,7 +1215,7 @@ xfs_ioctl_setattr_xflags( struct fsxattr *fa) {struct xfs_mount *mp = ip->i_mount; -uint64_t di_flags2; +uint64_t i_flags2;/* Can't change realtime flag if any extents are allocated. */ if ((ip->i_df.if_nextents || ip->i_delayed_blks) &&
@@ -1231,19 +1231,19 @@ xfs_ioctl_setattr_xflags(/* Clear reflink if we are actually able to set the rt flag. */ if ((fa->fsx_xflags &FS_XFLAG_REALTIME ) &&xfs_is_reflink_inode (ip)) - ip->i_d.di_flags2 &= ~XFS_DIFLAG2_REFLINK ; + ip->i_diflags2 &= ~XFS_DIFLAG2_REFLINK ;/* Don't allow us to set DAX mode for a reflinked file for now. */ if ((fa->fsx_xflags &FS_XFLAG_DAX ) &&xfs_is_reflink_inode (ip))return -EINVAL ;/* diflags2 only valid for v3 inodes. */ - di_flags2 =xfs_flags2diflags2 (ip, fa->fsx_xflags); -if (di_flags2 && !xfs_sb_version_has_v3inode (&mp->m_sb)) + i_flags2 =xfs_flags2diflags2 (ip, fa->fsx_xflags); +if (i_flags2 && !xfs_sb_version_has_v3inode (&mp->m_sb))return -EINVAL ; ip->i_diflags =xfs_flags2diflags (ip, fa->fsx_xflags); - ip->i_d.di_flags2 = di_flags2; + ip->i_diflags2 = i_flags2;xfs_diflags_to_iflags (ip, false);xfs_trans_ichgtime (tp, ip,XFS_ICHGTIME_CHG );
@@ -1268,9 +1268,9 @@ xfs_ioctl_setattr_prepare_dax(return ;if (((fa->fsx_xflags &FS_XFLAG_DAX ) && - !(ip->i_d.di_flags2 &XFS_DIFLAG2_DAX )) || + !(ip->i_diflags2 &XFS_DIFLAG2_DAX )) || (!(fa->fsx_xflags &FS_XFLAG_DAX ) && - (ip->i_d.di_flags2 &XFS_DIFLAG2_DAX ))) + (ip->i_diflags2 &XFS_DIFLAG2_DAX )))d_mark_dontcache (inode); }
@@ -1526,7 +1526,7 @@ xfs_ioctl_setattr( ip->i_extsize =0 ;if (xfs_sb_version_has_v3inode (&mp->m_sb)) { -if (ip->i_d.di_flags2 &XFS_DIFLAG2_COWEXTSIZE ) +if (ip->i_diflags2 &XFS_DIFLAG2_COWEXTSIZE ) ip->i_cowextsize =XFS_B_TO_FSB (mp, fa->fsx_cowextsize);else ip->i_cowextsize =0 ;
@@ -1575,7 +1575,7 @@ xfs_ioc_getxflags( {unsigned int flags; - flags =xfs_di2lxflags (ip->i_diflags, ip->i_d.di_flags2); + flags =xfs_di2lxflags (ip->i_diflags, ip->i_diflags2);if (copy_to_user (arg, &flags,sizeof (flags)))return -EFAULT ;return 0 ;
fs/xfs/xfs_iops.c +1 -1
@@ -1286,7 +1286,7 @@ xfs_inode_should_enable_dax(return false;if (ip->i_mount->m_flags &XFS_MOUNT_DAX_ALWAYS )return true; -if (ip->i_d.di_flags2 &XFS_DIFLAG2_DAX ) +if (ip->i_diflags2 &XFS_DIFLAG2_DAX )return true;return false; }
fs/xfs/xfs_itable.c +1 -1
@@ -113,7 +113,7 @@ xfs_bulkstat_one_int(if (xfs_sb_version_has_v3inode (&mp->m_sb)) { buf->bs_btime = dic->di_crtime.tv_sec; buf->bs_btime_nsec = dic->di_crtime.tv_nsec; -if (dic->di_flags2 &XFS_DIFLAG2_COWEXTSIZE ) +if (ip->i_diflags2 &XFS_DIFLAG2_COWEXTSIZE ) buf->bs_cowextsize_blks = ip->i_cowextsize; }
fs/xfs/xfs_reflink.c +4 -4
@@ -874,7 +874,7 @@ xfs_reflink_set_inode_flag(if (!xfs_is_reflink_inode (src)) {trace_xfs_reflink_set_inode_flag (src);xfs_trans_ijoin (tp, src,XFS_ILOCK_EXCL ); - src->i_d.di_flags2 |=XFS_DIFLAG2_REFLINK ; + src->i_diflags2 |=XFS_DIFLAG2_REFLINK ;xfs_trans_log_inode (tp, src,XFS_ILOG_CORE );xfs_ifork_init_cow (src); }else
@@ -886,7 +886,7 @@ xfs_reflink_set_inode_flag(if (!xfs_is_reflink_inode (dest)) {trace_xfs_reflink_set_inode_flag (dest);xfs_trans_ijoin (tp, dest,XFS_ILOCK_EXCL ); - dest->i_d.di_flags2 |=XFS_DIFLAG2_REFLINK ; + dest->i_diflags2 |=XFS_DIFLAG2_REFLINK ;xfs_trans_log_inode (tp, dest,XFS_ILOG_CORE );xfs_ifork_init_cow (dest); }else
@@ -935,7 +935,7 @@ xfs_reflink_update_dest(if (cowextsize) { dest->i_cowextsize = cowextsize; - dest->i_d.di_flags2 |=XFS_DIFLAG2_COWEXTSIZE ; + dest->i_diflags2 |=XFS_DIFLAG2_COWEXTSIZE ; }xfs_trans_log_inode (tp, dest,XFS_ILOG_CORE );
@@ -1455,7 +1455,7 @@ xfs_reflink_clear_inode_flag(/* Clear the inode flag. */ trace_xfs_reflink_unset_inode_flag (ip); - ip->i_d.di_flags2 &= ~XFS_DIFLAG2_REFLINK ; + ip->i_diflags2 &= ~XFS_DIFLAG2_REFLINK ;xfs_inode_clear_cowblocks_tag (ip);xfs_trans_log_inode (*tpp, ip,XFS_ILOG_CORE );
Signature · 1 line
2.30.1
Re: [PATCH 18/20] xfs: move the di_flags2 field to struct xfs_inode
Quoted 332 lines · Christoph Hellwig
In preparation of removing the historic icinode struct, move the flags2 field into the containing
xfs_inodestructure.Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Darrick J. Wong <[email protected]>--- fs/xfs/libxfs/xfs_inode_buf.c | 4 ++-- fs/xfs/libxfs/xfs_inode_buf.h | 2 -- fs/xfs/libxfs/xfs_trans_inode.c | 2 +- fs/xfs/xfs_bmap_util.c | 24 ++++++++++++------------ fs/xfs/xfs_file.c | 4 ++-- fs/xfs/xfs_icache.c | 2 +- fs/xfs/xfs_inode.c | 20 +++++++++----------- fs/xfs/xfs_inode.h | 5 +++-- fs/xfs/xfs_inode_item.c | 2 +- fs/xfs/xfs_ioctl.c | 24 ++++++++++++------------ fs/xfs/xfs_iops.c | 2 +- fs/xfs/xfs_itable.c | 2 +- fs/xfs/xfs_reflink.c | 8 ++++---- 13 files changed, 49 insertions(+), 52 deletions(-)fs/xfs/libxfs/xfs_inode_buf.c +2
-2@@ -240,7 +240,7 @@ xfs_inode_from_disk(inode_set_iversion_queried (inode,be64_to_cpu (from->di_changecount)); to->di_crtime =xfs_inode_from_disk_ts (from, from->di_crtime); - to->di_flags2 =be64_to_cpu (from->di_flags2); + ip->i_diflags2 =be64_to_cpu (from->di_flags2); ip->i_cowextsize =be32_to_cpu (from->di_cowextsize); }@@ -319,7 +319,7 @@ xfs_inode_to_disk( to->di_version =3 ; to->di_changecount =cpu_to_be64 (inode_peek_iversion (inode)); to->di_crtime =xfs_inode_to_disk_ts (ip, from->di_crtime); - to->di_flags2 =cpu_to_be64 (from->di_flags2); + to->di_flags2 =cpu_to_be64 (ip->i_diflags2); to->di_cowextsize =cpu_to_be32 (ip->i_cowextsize); to->di_ino =cpu_to_be64 (ip->i_ino); to->di_lsn =cpu_to_be64 (lsn);fs/xfs/libxfs/xfs_inode_buf.h +0
-2@@ -16,8 +16,6 @@ struct xfs_dinode;* format specific structures at the appropriate time. */ struct xfs_icdinode { -uint64_t di_flags2;/* more random flags */ -struct timespec64 di_crtime;/* time created */ };fs/xfs/libxfs/xfs_trans_inode.c +1
-1@@ -138,7 +138,7 @@ xfs_trans_log_inode(if ((flags & (XFS_ILOG_CORE |XFS_ILOG_TIMESTAMP )) &&xfs_sb_version_hasbigtime (&ip->i_mount->m_sb) && !xfs_inode_has_bigtime (ip)) { - ip->i_d.di_flags2 |=XFS_DIFLAG2_BIGTIME ; + ip->i_diflags2 |=XFS_DIFLAG2_BIGTIME ; flags |=XFS_ILOG_CORE ; }fs/xfs/xfs_bmap_util.c +12
-12@@ -1323,9 +1323,9 @@ xfs_swap_extent_rmap(* rmap functions when we go to fix up the rmaps. The flags * will be switch for reals later. */ - tip_flags2 = tip->i_d.di_flags2; -if (ip->i_d.di_flags2 &XFS_DIFLAG2_REFLINK ) - tip->i_d.di_flags2 |=XFS_DIFLAG2_REFLINK ; + tip_flags2 = tip->i_diflags2; +if (ip->i_diflags2 &XFS_DIFLAG2_REFLINK ) + tip->i_diflags2 |=XFS_DIFLAG2_REFLINK ; offset_fsb =0 ; end_fsb =XFS_B_TO_FSB (ip->i_mount,i_size_read (VFS_I (ip)));@@ -1412,12 +1412,12 @@ xfs_swap_extent_rmap( offset_fsb += ilen; } - tip->i_d.di_flags2 = tip_flags2; + tip->i_diflags2 = tip_flags2;return 0 ; out:trace_xfs_swap_extent_rmap_error (ip, error, _RET_IP_); - tip->i_d.di_flags2 = tip_flags2; + tip->i_diflags2 = tip_flags2;return error; }@@ -1715,13 +1715,13 @@ xfs_swap_extents( goto out_trans_cancel;/* Do we have to swap reflink flags? */ -if ((ip->i_d.di_flags2 &XFS_DIFLAG2_REFLINK ) ^ - (tip->i_d.di_flags2 &XFS_DIFLAG2_REFLINK )) { - f = ip->i_d.di_flags2 &XFS_DIFLAG2_REFLINK ; - ip->i_d.di_flags2 &= ~XFS_DIFLAG2_REFLINK ; - ip->i_d.di_flags2 |= tip->i_d.di_flags2 &XFS_DIFLAG2_REFLINK ; - tip->i_d.di_flags2 &= ~XFS_DIFLAG2_REFLINK ; - tip->i_d.di_flags2 |= f &XFS_DIFLAG2_REFLINK ; +if ((ip->i_diflags2 &XFS_DIFLAG2_REFLINK ) ^ + (tip->i_diflags2 &XFS_DIFLAG2_REFLINK )) { + f = ip->i_diflags2 &XFS_DIFLAG2_REFLINK ; + ip->i_diflags2 &= ~XFS_DIFLAG2_REFLINK ; + ip->i_diflags2 |= tip->i_diflags2 &XFS_DIFLAG2_REFLINK ; + tip->i_diflags2 &= ~XFS_DIFLAG2_REFLINK ; + tip->i_diflags2 |= f &XFS_DIFLAG2_REFLINK ; }/* Swap the cow forks. */ fs/xfs/xfs_file.c +2
-2@@ -1159,9 +1159,9 @@ xfs_file_remap_range(*/ cowextsize =0 ;if (pos_in ==0 && len ==i_size_read (inode_in) && - (src->i_d.di_flags2 &XFS_DIFLAG2_COWEXTSIZE ) && + (src->i_diflags2 &XFS_DIFLAG2_COWEXTSIZE ) && pos_out ==0 && len >=i_size_read (inode_out) && - !(dest->i_d.di_flags2 &XFS_DIFLAG2_COWEXTSIZE )) + !(dest->i_diflags2 &XFS_DIFLAG2_COWEXTSIZE )) cowextsize = src->i_cowextsize; ret = xfs_reflink_update_dest(dest, pos_out + len, cowextsize,fs/xfs/xfs_icache.c +1
-1@@ -63,7 +63,7 @@ xfs_inode_alloc(memset (&ip->i_df,0 ,sizeof (ip->i_df)); ip->i_flags =0 ; ip->i_delayed_blks =0 ; - ip->i_d.di_flags2 = mp->m_ino_geo.new_diflags2; + ip->i_diflags2 = mp->m_ino_geo.new_diflags2; ip->i_nblocks =0 ; ip->i_forkoff =0 ; ip->i_sick =0 ;fs/xfs/xfs_inode.c +9
-11@@ -80,7 +80,7 @@ xfs_get_cowextsz_hint(xfs_extlen_t a, b; a =0 ; -if (ip->i_d.di_flags2 &XFS_DIFLAG2_COWEXTSIZE ) +if (ip->i_diflags2 &XFS_DIFLAG2_COWEXTSIZE ) a = ip->i_cowextsize; b =xfs_get_extsz_hint (ip);@@ -654,9 +654,7 @@ uintxfs_ip2xflags ( struct xfs_inode *ip) { -struct xfs_icdinode *dic = &ip->i_d; - -return _xfs_dic2xflags (ip->i_diflags, dic->di_flags2,XFS_IFORK_Q (ip)); +return _xfs_dic2xflags (ip->i_diflags, ip->i_diflags2,XFS_IFORK_Q (ip)); }/* @@ -752,12 +750,12 @@ xfs_inode_inherit_flags2( struct xfs_inode *ip, const struct xfs_inode *pip) { -if (pip->i_d.di_flags2 &XFS_DIFLAG2_COWEXTSIZE ) { - ip->i_d.di_flags2 |=XFS_DIFLAG2_COWEXTSIZE ; +if (pip->i_diflags2 &XFS_DIFLAG2_COWEXTSIZE ) { + ip->i_diflags2 |=XFS_DIFLAG2_COWEXTSIZE ; ip->i_cowextsize = pip->i_cowextsize; } -if (pip->i_d.di_flags2 &XFS_DIFLAG2_DAX ) - ip->i_d.di_flags2 |=XFS_DIFLAG2_DAX ; +if (pip->i_diflags2 &XFS_DIFLAG2_DAX ) + ip->i_diflags2 |=XFS_DIFLAG2_DAX ; }/* @@ -862,7 +860,7 @@ xfs_init_new_inode(case S_IFDIR :if (pip && (pip->i_diflags &XFS_DIFLAG_ANY ))xfs_inode_inherit_flags (ip, pip); -if (pip && (pip->i_d.di_flags2 &XFS_DIFLAG2_ANY )) +if (pip && (pip->i_diflags2 &XFS_DIFLAG2_ANY ))xfs_inode_inherit_flags2 (ip, pip);/* FALLTHROUGH */ case S_IFLNK :@@ -1346,7 +1344,7 @@ xfs_itruncate_clear_reflink_flags( dfork =XFS_IFORK_PTR (ip,XFS_DATA_FORK ); cfork =XFS_IFORK_PTR (ip,XFS_COW_FORK );if (dfork->if_bytes ==0 && cfork->if_bytes ==0 ) - ip->i_d.di_flags2 &= ~XFS_DIFLAG2_REFLINK ; + ip->i_diflags2 &= ~XFS_DIFLAG2_REFLINK ;if (cfork->if_bytes ==0 )xfs_inode_clear_cowblocks_tag (ip); }@@ -2612,7 +2610,7 @@ xfs_ifree(VFS_I (ip)->i_mode =0 ;/* mark incore inode as free */ ip->i_diflags =0 ; - ip->i_d.di_flags2 = ip->i_mount->m_ino_geo.new_diflags2; + ip->i_diflags2 = ip->i_mount->m_ino_geo.new_diflags2; ip->i_forkoff =0 ;/* mark the attr fork not in use */ ip->i_df.if_format =XFS_DINODE_FMT_EXTENTS ;if (xfs_iflags_test (ip,XFS_IPRESERVE_DM_FIELDS ))fs/xfs/xfs_inode.h +3
-2@@ -65,6 +65,7 @@ typedef struct xfs_inode { };uint8_t i_forkoff;/* attr fork offset >> 3 */ uint16_t i_diflags;/* XFS_DIFLAG_... */ +uint64_t i_diflags2;/* XFS_DIFLAG2_... */ struct xfs_icdinode i_d;/* most of ondisk inode */ @@ -193,7 +194,7 @@ xfs_get_initial_prid(struct xfs_inode *dp)static inline bool xfs_is_reflink_inode (struct xfs_inode *ip) { -return ip->i_d.di_flags2 &XFS_DIFLAG2_REFLINK ; +return ip->i_diflags2 &XFS_DIFLAG2_REFLINK ; }static inline bool xfs_is_metadata_inode (struct xfs_inode *ip)@@ -215,7 +216,7 @@ static inline bool xfs_inode_has_cow_data(struct xfs_inode *ip)static inline bool xfs_inode_has_bigtime (struct xfs_inode *ip) { -return ip->i_d.di_flags2 &XFS_DIFLAG2_BIGTIME ; +return ip->i_diflags2 &XFS_DIFLAG2_BIGTIME ; }/* fs/xfs/xfs_inode_item.c +1
-1@@ -387,7 +387,7 @@ xfs_inode_to_log_dinode( to->di_version =3 ; to->di_changecount =inode_peek_iversion (inode); to->di_crtime =xfs_inode_to_log_dinode_ts (ip, from->di_crtime); - to->di_flags2 = from->di_flags2; + to->di_flags2 = ip->i_diflags2; to->di_cowextsize = ip->i_cowextsize; to->di_ino = ip->i_ino; to->di_lsn = lsn;fs/xfs/xfs_ioctl.c +10
-10@@ -1123,7 +1123,7 @@ xfs_fill_fsxattr(simple_fill_fsxattr (fa,xfs_ip2xflags (ip)); fa->fsx_extsize =XFS_FSB_TO_B (mp, ip->i_extsize); -if (ip->i_d.di_flags2 &XFS_DIFLAG2_COWEXTSIZE ) +if (ip->i_diflags2 &XFS_DIFLAG2_COWEXTSIZE ) fa->fsx_cowextsize =XFS_FSB_TO_B (mp, ip->i_cowextsize); fa->fsx_projid = ip->i_projid;if (ifp && (ifp->if_flags &XFS_IFEXTENTS ))@@ -1197,8 +1197,8 @@ xfs_flags2diflags2( unsigned int xflags) {uint64_t di_flags2 = - (ip->i_d.di_flags2 & (XFS_DIFLAG2_REFLINK | -XFS_DIFLAG2_BIGTIME )); + (ip->i_diflags2 & (XFS_DIFLAG2_REFLINK | +XFS_DIFLAG2_BIGTIME ));if (xflags &FS_XFLAG_DAX ) di_flags2 |=XFS_DIFLAG2_DAX ;@@ -1215,7 +1215,7 @@ xfs_ioctl_setattr_xflags( struct fsxattr *fa) {struct xfs_mount *mp = ip->i_mount; -uint64_t di_flags2; +uint64_t i_flags2;/* Can't change realtime flag if any extents are allocated. */ if ((ip->i_df.if_nextents || ip->i_delayed_blks) &&@@ -1231,19 +1231,19 @@ xfs_ioctl_setattr_xflags(/* Clear reflink if we are actually able to set the rt flag. */ if ((fa->fsx_xflags &FS_XFLAG_REALTIME ) &&xfs_is_reflink_inode (ip)) - ip->i_d.di_flags2 &= ~XFS_DIFLAG2_REFLINK ; + ip->i_diflags2 &= ~XFS_DIFLAG2_REFLINK ;/* Don't allow us to set DAX mode for a reflinked file for now. */ if ((fa->fsx_xflags &FS_XFLAG_DAX ) &&xfs_is_reflink_inode (ip))return -EINVAL ;/* diflags2 only valid for v3 inodes. */ - di_flags2 =xfs_flags2diflags2 (ip, fa->fsx_xflags); -if (di_flags2 && !xfs_sb_version_has_v3inode (&mp->m_sb)) + i_flags2 =xfs_flags2diflags2 (ip, fa->fsx_xflags); +if (i_flags2 && !xfs_sb_version_has_v3inode (&mp->m_sb))return -EINVAL ; ip->i_diflags =xfs_flags2diflags (ip, fa->fsx_xflags); - ip->i_d.di_flags2 = di_flags2; + ip->i_diflags2 = i_flags2;xfs_diflags_to_iflags (ip, false);xfs_trans_ichgtime (tp, ip,XFS_ICHGTIME_CHG );@@ -1268,9 +1268,9 @@ xfs_ioctl_setattr_prepare_dax(return ;if (((fa->fsx_xflags &FS_XFLAG_DAX ) && - !(ip->i_d.di_flags2 &XFS_DIFLAG2_DAX )) || + !(ip->i_diflags2 &XFS_DIFLAG2_DAX )) || (!(fa->fsx_xflags &FS_XFLAG_DAX ) && - (ip->i_d.di_flags2 &XFS_DIFLAG2_DAX ))) + (ip->i_diflags2 &XFS_DIFLAG2_DAX )))d_mark_dontcache (inode); }
fs/xfs/xfs_ioctl.c xfs_ioctl_setattr( · line 1529
Quoted 5 lines
fs/xfs/xfs_ioctl.c +1
-1@@ -1526,7 +1526,7 @@ xfs_ioctl_setattr( ip->i_extsize =0 ;if (xfs_sb_version_has_v3inode (&mp->m_sb)) { -if (ip->i_d.di_flags2 &XFS_DIFLAG2_COWEXTSIZE ) +if (ip->i_diflags2 &XFS_DIFLAG2_COWEXTSIZE )
Space before tab here. Please fix this in your tree if you end up sending a v5 of this.
--D
Quoted 81 lines
fs/xfs/xfs_ioctl.c +1
-1ip->i_cowextsize =XFS_B_TO_FSB (mp, fa->fsx_cowextsize); else ip->i_cowextsize = 0;@@ -1575,7 +1575,7 @@ xfs_ioc_getxflags( {unsigned int flags; - flags =xfs_di2lxflags (ip->i_diflags, ip->i_d.di_flags2); + flags =xfs_di2lxflags (ip->i_diflags, ip->i_diflags2);if (copy_to_user (arg, &flags,sizeof (flags)))return -EFAULT ;return 0 ;fs/xfs/xfs_iops.c +1
-1@@ -1286,7 +1286,7 @@ xfs_inode_should_enable_dax(return false;if (ip->i_mount->m_flags &XFS_MOUNT_DAX_ALWAYS )return true; -if (ip->i_d.di_flags2 &XFS_DIFLAG2_DAX ) +if (ip->i_diflags2 &XFS_DIFLAG2_DAX )return true;return false; }fs/xfs/xfs_itable.c +1
-1@@ -113,7 +113,7 @@ xfs_bulkstat_one_int(if (xfs_sb_version_has_v3inode (&mp->m_sb)) { buf->bs_btime = dic->di_crtime.tv_sec; buf->bs_btime_nsec = dic->di_crtime.tv_nsec; -if (dic->di_flags2 &XFS_DIFLAG2_COWEXTSIZE ) +if (ip->i_diflags2 &XFS_DIFLAG2_COWEXTSIZE ) buf->bs_cowextsize_blks = ip->i_cowextsize; }fs/xfs/xfs_reflink.c +4
-4@@ -874,7 +874,7 @@ xfs_reflink_set_inode_flag(if (!xfs_is_reflink_inode (src)) {trace_xfs_reflink_set_inode_flag (src);xfs_trans_ijoin (tp, src,XFS_ILOCK_EXCL ); - src->i_d.di_flags2 |=XFS_DIFLAG2_REFLINK ; + src->i_diflags2 |=XFS_DIFLAG2_REFLINK ;xfs_trans_log_inode (tp, src,XFS_ILOG_CORE );xfs_ifork_init_cow (src); }else @@ -886,7 +886,7 @@ xfs_reflink_set_inode_flag(if (!xfs_is_reflink_inode (dest)) {trace_xfs_reflink_set_inode_flag (dest);xfs_trans_ijoin (tp, dest,XFS_ILOCK_EXCL ); - dest->i_d.di_flags2 |=XFS_DIFLAG2_REFLINK ; + dest->i_diflags2 |=XFS_DIFLAG2_REFLINK ;xfs_trans_log_inode (tp, dest,XFS_ILOG_CORE );xfs_ifork_init_cow (dest); }else @@ -935,7 +935,7 @@ xfs_reflink_update_dest(if (cowextsize) { dest->i_cowextsize = cowextsize; - dest->i_d.di_flags2 |=XFS_DIFLAG2_COWEXTSIZE ; + dest->i_diflags2 |=XFS_DIFLAG2_COWEXTSIZE ; }xfs_trans_log_inode (tp, dest,XFS_ILOG_CORE );@@ -1455,7 +1455,7 @@ xfs_reflink_clear_inode_flag(/* Clear the inode flag. */ trace_xfs_reflink_unset_inode_flag (ip); - ip->i_d.di_flags2 &= ~XFS_DIFLAG2_REFLINK ; + ip->i_diflags2 &= ~XFS_DIFLAG2_REFLINK ;xfs_inode_clear_cowblocks_tag (ip);xfs_trans_log_inode (*tpp, ip,XFS_ILOG_CORE );Signature · 1 line
2.30.1
PATCH 19/20 xfs: move the di_crtime field to struct xfs_inode
In reply to Christoph HellwigMove the crtime field from struct xfs_icdinode into stuct xfs_inode and remove the now entirely unused struct xfs_icdinode.
--- fs/xfs/libxfs/xfs_format.h | 5 ++--- fs/xfs/libxfs/xfs_inode_buf.c | 6 ++---- fs/xfs/libxfs/xfs_inode_buf.h | 10 ---------- fs/xfs/libxfs/xfs_trans_inode.c | 2 +- fs/xfs/xfs_inode.c | 2 +- fs/xfs/xfs_inode.h | 3 +-- fs/xfs/xfs_inode_item.c | 3 +-- fs/xfs/xfs_iops.c | 2 +- fs/xfs/xfs_itable.c | 7 ++----- 9 files changed, 11 insertions(+), 29 deletions(-)
fs/xfs/libxfs/xfs_format.h +2 -3
@@ -955,9 +955,8 @@ static inline time64_t xfs_bigtime_to_unix(uint64_t ondisk_seconds)* attribute use the XFS_DFORK_DPTR, XFS_DFORK_APTR, and XFS_DFORK_PTR macros * below. * -* There is a very similar struct icdinode in xfs_inode which matches the -* layout of the first 96 bytes of this structure, but is kept in native -* format instead of big endian. +* There is a very similar struct xfs_log_dinode which matches the layout of +* this structure, but is kept in native format instead of big endian. * * Note: di_flushiter is only used by v1/2 inodes - it's effectively a zeroed * padding field for v3 inodes.
fs/xfs/libxfs/xfs_inode_buf.c +2 -4
@@ -173,7 +173,6 @@ xfs_inode_from_disk(struct xfs_inode *ip, struct xfs_dinode *from) { - struct xfs_icdinode *to = &ip->i_d; struct inode *inode = VFS_I(ip);int error;xfs_failaddr_t fa;
@@ -239,7 +238,7 @@ xfs_inode_from_disk(if (xfs_sb_version_has_v3inode (&ip->i_mount->m_sb)) {inode_set_iversion_queried (inode,be64_to_cpu (from->di_changecount)); - to->di_crtime =xfs_inode_from_disk_ts (from, from->di_crtime); + ip->i_crtime =xfs_inode_from_disk_ts (from, from->di_crtime); ip->i_diflags2 =be64_to_cpu (from->di_flags2); ip->i_cowextsize =be32_to_cpu (from->di_cowextsize); }
@@ -286,7 +285,6 @@ xfs_inode_to_disk( struct xfs_dinode *to, xfs_lsn_t lsn) { -struct xfs_icdinode *from = &ip->i_d;struct inode *inode =VFS_I (ip); to->di_magic =cpu_to_be16 (XFS_DINODE_MAGIC );
@@ -318,7 +316,7 @@ xfs_inode_to_disk(if (xfs_sb_version_has_v3inode (&ip->i_mount->m_sb)) { to->di_version =3 ; to->di_changecount =cpu_to_be64 (inode_peek_iversion (inode)); - to->di_crtime =xfs_inode_to_disk_ts (ip, from->di_crtime); + to->di_crtime =xfs_inode_to_disk_ts (ip, ip->i_crtime); to->di_flags2 =cpu_to_be64 (ip->i_diflags2); to->di_cowextsize =cpu_to_be32 (ip->i_cowextsize); to->di_ino =cpu_to_be64 (ip->i_ino);
fs/xfs/libxfs/xfs_inode_buf.h +0 -10
@@ -9,16 +9,6 @@struct xfs_inode ;struct xfs_dinode ; -/* -* In memory representation of the XFS inode. This is held in the in-core struct -* xfs_inode and represents the current on disk values but the structure is not -* in on-disk format. That is, this structure is always translated to on-disk -* format specific structures at the appropriate time. -*/ -struct xfs_icdinode { -struct timespec64 di_crtime;/* time created */ -}; -/* * Inode location information. Stored in the inode and passed to * xfs_imap_to_bp() to get a buffer and dinode for a given inode.
fs/xfs/libxfs/xfs_trans_inode.c +1 -1
@@ -70,7 +70,7 @@ xfs_trans_ichgtime(if (flags &XFS_ICHGTIME_CHG ) inode->i_ctime = tv;if (flags &XFS_ICHGTIME_CREATE ) - ip->i_d.di_crtime = tv; + ip->i_crtime = tv; }/*
fs/xfs/xfs_inode.c +1 -1
@@ -843,7 +843,7 @@ xfs_init_new_inode(if (xfs_sb_version_has_v3inode (&mp->m_sb)) {inode_set_iversion (inode,1 ); ip->i_cowextsize =0 ; - ip->i_d.di_crtime = tv; + ip->i_crtime = tv; } flags =XFS_ILOG_CORE ;
fs/xfs/xfs_inode.h +1 -2
@@ -66,8 +66,7 @@ typedef struct xfs_inode {uint8_t i_forkoff;/* attr fork offset >> 3 */ uint16_t i_diflags;/* XFS_DIFLAG_... */ uint64_t i_diflags2;/* XFS_DIFLAG2_... */ - -struct xfs_icdinode i_d;/* most of ondisk inode */ +struct timespec64 i_crtime;/* time created */ /* VFS inode */ struct inode i_vnode;/* embedded VFS inode */
fs/xfs/xfs_inode_item.c +1 -2
@@ -350,7 +350,6 @@ xfs_inode_to_log_dinode( struct xfs_log_dinode *to, xfs_lsn_t lsn) { -struct xfs_icdinode *from = &ip->i_d;struct inode *inode =VFS_I (ip); to->di_magic =XFS_DINODE_MAGIC ;
@@ -386,7 +385,7 @@ xfs_inode_to_log_dinode(if (xfs_sb_version_has_v3inode (&ip->i_mount->m_sb)) { to->di_version =3 ; to->di_changecount =inode_peek_iversion (inode); - to->di_crtime =xfs_inode_to_log_dinode_ts (ip, from->di_crtime); + to->di_crtime =xfs_inode_to_log_dinode_ts (ip, ip->i_crtime); to->di_flags2 = ip->i_diflags2; to->di_cowextsize = ip->i_cowextsize; to->di_ino = ip->i_ino;
fs/xfs/xfs_iops.c +1 -1
@@ -599,7 +599,7 @@ xfs_vn_getattr(if (xfs_sb_version_has_v3inode (&mp->m_sb)) {if (request_mask &STATX_BTIME ) { stat->result_mask |=STATX_BTIME ; - stat->btime = ip->i_d.di_crtime; + stat->btime = ip->i_crtime; } }
fs/xfs/xfs_itable.c +2 -5
@@ -60,7 +60,6 @@ xfs_bulkstat_one_int( struct xfs_bstat_chunk *bc) {struct user_namespace *sb_userns = mp->m_super->s_user_ns; -struct xfs_icdinode *dic;/* dinode core info pointer */ struct xfs_inode *ip;/* incore inode pointer */ struct inode *inode;struct xfs_bulkstat *buf = bc->buf;
@@ -81,8 +80,6 @@ xfs_bulkstat_one_int(ASSERT (ip->i_imap.im_blkno !=0 ); inode =VFS_I (ip); - dic = &ip->i_d; -/* xfs_iget returns the following without needing * further change. */
@@ -111,8 +108,8 @@ xfs_bulkstat_one_int( buf->bs_version =XFS_BULKSTAT_VERSION_V5 ;if (xfs_sb_version_has_v3inode (&mp->m_sb)) { - buf->bs_btime = dic->di_crtime.tv_sec; - buf->bs_btime_nsec = dic->di_crtime.tv_nsec; + buf->bs_btime = ip->i_crtime.tv_sec; + buf->bs_btime_nsec = ip->i_crtime.tv_nsec;if (ip->i_diflags2 &XFS_DIFLAG2_COWEXTSIZE ) buf->bs_cowextsize_blks = ip->i_cowextsize; }
Signature · 1 line
2.30.1
PATCH 20/20 xfs: merge _xfs_dic2xflags into xfs_ip2xflags
In reply to Christoph HellwigMerge _xfs_dic2xflags into its only caller.
--- fs/xfs/xfs_inode.c | 54 +++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 32 deletions(-)
fs/xfs/xfs_inode.c +22 -32
@@ -598,65 +598,55 @@ xfs_lock_two_inodes( } } -STATIC uint -_xfs_dic2xflags ( -uint16_t di_flags, -uint64_t di_flags2, -bool has_attr) +uint +xfs_ip2xflags ( +struct xfs_inode *ip) {uint flags =0 ; -if (di_flags &XFS_DIFLAG_ANY ) { -if (di_flags &XFS_DIFLAG_REALTIME ) +if (ip->i_diflags &XFS_DIFLAG_ANY ) { +if (ip->i_diflags &XFS_DIFLAG_REALTIME ) flags |=FS_XFLAG_REALTIME ; -if (di_flags &XFS_DIFLAG_PREALLOC ) +if (ip->i_diflags &XFS_DIFLAG_PREALLOC ) flags |=FS_XFLAG_PREALLOC ; -if (di_flags &XFS_DIFLAG_IMMUTABLE ) +if (ip->i_diflags &XFS_DIFLAG_IMMUTABLE ) flags |=FS_XFLAG_IMMUTABLE ; -if (di_flags &XFS_DIFLAG_APPEND ) +if (ip->i_diflags &XFS_DIFLAG_APPEND ) flags |=FS_XFLAG_APPEND ; -if (di_flags &XFS_DIFLAG_SYNC ) +if (ip->i_diflags &XFS_DIFLAG_SYNC ) flags |=FS_XFLAG_SYNC ; -if (di_flags &XFS_DIFLAG_NOATIME ) +if (ip->i_diflags &XFS_DIFLAG_NOATIME ) flags |=FS_XFLAG_NOATIME ; -if (di_flags &XFS_DIFLAG_NODUMP ) +if (ip->i_diflags &XFS_DIFLAG_NODUMP ) flags |=FS_XFLAG_NODUMP ; -if (di_flags &XFS_DIFLAG_RTINHERIT ) +if (ip->i_diflags &XFS_DIFLAG_RTINHERIT ) flags |=FS_XFLAG_RTINHERIT ; -if (di_flags &XFS_DIFLAG_PROJINHERIT ) +if (ip->i_diflags &XFS_DIFLAG_PROJINHERIT ) flags |=FS_XFLAG_PROJINHERIT ; -if (di_flags &XFS_DIFLAG_NOSYMLINKS ) +if (ip->i_diflags &XFS_DIFLAG_NOSYMLINKS ) flags |=FS_XFLAG_NOSYMLINKS ; -if (di_flags &XFS_DIFLAG_EXTSIZE ) +if (ip->i_diflags &XFS_DIFLAG_EXTSIZE ) flags |=FS_XFLAG_EXTSIZE ; -if (di_flags &XFS_DIFLAG_EXTSZINHERIT ) +if (ip->i_diflags &XFS_DIFLAG_EXTSZINHERIT ) flags |=FS_XFLAG_EXTSZINHERIT ; -if (di_flags &XFS_DIFLAG_NODEFRAG ) +if (ip->i_diflags &XFS_DIFLAG_NODEFRAG ) flags |=FS_XFLAG_NODEFRAG ; -if (di_flags &XFS_DIFLAG_FILESTREAM ) +if (ip->i_diflags &XFS_DIFLAG_FILESTREAM ) flags |=FS_XFLAG_FILESTREAM ; } -if (di_flags2 &XFS_DIFLAG2_ANY ) { -if (di_flags2 &XFS_DIFLAG2_DAX ) +if (ip->i_diflags2 &XFS_DIFLAG2_ANY ) { +if (ip->i_diflags2 &XFS_DIFLAG2_DAX ) flags |=FS_XFLAG_DAX ; -if (di_flags2 &XFS_DIFLAG2_COWEXTSIZE ) +if (ip->i_diflags2 &XFS_DIFLAG2_COWEXTSIZE ) flags |=FS_XFLAG_COWEXTSIZE ; } -if (has_attr) +if (XFS_IFORK_Q (ip)) flags |=FS_XFLAG_HASATTR ; -return flags; } -uint -xfs_ip2xflags ( -struct xfs_inode *ip) -{ -return _xfs_dic2xflags (ip->i_diflags, ip->i_diflags2,XFS_IFORK_Q (ip)); -} -/* * Lookups up an inode from "name". If ci_name is not NULL, then a CI match * is allowed, otherwise it has to be an exact match. If a CI match is found,
Signature · 1 line
2.30.1
Re: [PATCH 20/20] xfs: merge _xfs_dic2xflags into xfs_ip2xflags
Quoted 3 lines · Christoph Hellwig
Merge
_xfs_dic2xflagsinto its only caller.Signed-off-by Christoph Hellwig <[email protected]>
/me wonders if/how this will clash with Miklos' fileattr series, but eh, whatever, I don't think it will, and if it does it's easy enough to fix.
--D
Quoted 99 lines
--- fs/xfs/xfs_inode.c | 54 +++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 32 deletions(-)fs/xfs/xfs_inode.c +22
-32@@ -598,65 +598,55 @@ xfs_lock_two_inodes( } } -STATIC uint -_xfs_dic2xflags ( -uint16_t di_flags, -uint64_t di_flags2, -bool has_attr) +uint +xfs_ip2xflags ( +struct xfs_inode *ip) {uint flags =0 ; -if (di_flags &XFS_DIFLAG_ANY ) { -if (di_flags &XFS_DIFLAG_REALTIME ) +if (ip->i_diflags &XFS_DIFLAG_ANY ) { +if (ip->i_diflags &XFS_DIFLAG_REALTIME ) flags |=FS_XFLAG_REALTIME ; -if (di_flags &XFS_DIFLAG_PREALLOC ) +if (ip->i_diflags &XFS_DIFLAG_PREALLOC ) flags |=FS_XFLAG_PREALLOC ; -if (di_flags &XFS_DIFLAG_IMMUTABLE ) +if (ip->i_diflags &XFS_DIFLAG_IMMUTABLE ) flags |=FS_XFLAG_IMMUTABLE ; -if (di_flags &XFS_DIFLAG_APPEND ) +if (ip->i_diflags &XFS_DIFLAG_APPEND ) flags |=FS_XFLAG_APPEND ; -if (di_flags &XFS_DIFLAG_SYNC ) +if (ip->i_diflags &XFS_DIFLAG_SYNC ) flags |=FS_XFLAG_SYNC ; -if (di_flags &XFS_DIFLAG_NOATIME ) +if (ip->i_diflags &XFS_DIFLAG_NOATIME ) flags |=FS_XFLAG_NOATIME ; -if (di_flags &XFS_DIFLAG_NODUMP ) +if (ip->i_diflags &XFS_DIFLAG_NODUMP ) flags |=FS_XFLAG_NODUMP ; -if (di_flags &XFS_DIFLAG_RTINHERIT ) +if (ip->i_diflags &XFS_DIFLAG_RTINHERIT ) flags |=FS_XFLAG_RTINHERIT ; -if (di_flags &XFS_DIFLAG_PROJINHERIT ) +if (ip->i_diflags &XFS_DIFLAG_PROJINHERIT ) flags |=FS_XFLAG_PROJINHERIT ; -if (di_flags &XFS_DIFLAG_NOSYMLINKS ) +if (ip->i_diflags &XFS_DIFLAG_NOSYMLINKS ) flags |=FS_XFLAG_NOSYMLINKS ; -if (di_flags &XFS_DIFLAG_EXTSIZE ) +if (ip->i_diflags &XFS_DIFLAG_EXTSIZE ) flags |=FS_XFLAG_EXTSIZE ; -if (di_flags &XFS_DIFLAG_EXTSZINHERIT ) +if (ip->i_diflags &XFS_DIFLAG_EXTSZINHERIT ) flags |=FS_XFLAG_EXTSZINHERIT ; -if (di_flags &XFS_DIFLAG_NODEFRAG ) +if (ip->i_diflags &XFS_DIFLAG_NODEFRAG ) flags |=FS_XFLAG_NODEFRAG ; -if (di_flags &XFS_DIFLAG_FILESTREAM ) +if (ip->i_diflags &XFS_DIFLAG_FILESTREAM ) flags |=FS_XFLAG_FILESTREAM ; } -if (di_flags2 &XFS_DIFLAG2_ANY ) { -if (di_flags2 &XFS_DIFLAG2_DAX ) +if (ip->i_diflags2 &XFS_DIFLAG2_ANY ) { +if (ip->i_diflags2 &XFS_DIFLAG2_DAX ) flags |=FS_XFLAG_DAX ; -if (di_flags2 &XFS_DIFLAG2_COWEXTSIZE ) +if (ip->i_diflags2 &XFS_DIFLAG2_COWEXTSIZE ) flags |=FS_XFLAG_COWEXTSIZE ; } -if (has_attr) +if (XFS_IFORK_Q (ip)) flags |=FS_XFLAG_HASATTR ; -return flags; } -uint -xfs_ip2xflags ( -struct xfs_inode *ip) -{ -return _xfs_dic2xflags (ip->i_diflags, ip->i_diflags2,XFS_IFORK_Q (ip)); -} -/* * Lookups up an inode from "name". If ci_name is not NULL, then a CI match * is allowed, otherwise it has to be an exact match. If a CI match is found, Signature · 1 line
2.30.1
Re: [PATCH 20/20] xfs: merge _xfs_dic2xflags into xfs_ip2xflags
Quoted 7 lines · Darrick J. Wong
Quoted 3 lines · Christoph Hellwig
Merge
_xfs_dic2xflagsinto its only caller.Signed-off-by Christoph Hellwig <[email protected]>/me wonders if/how this will clash with Miklos' fileattr series, but eh, whatever, I don't think it will, and if it does it's easy enough to fix.
Feel free to drop the patch for now, it is not in any way urgent.
Re: [PATCH 20/20] xfs: merge _xfs_dic2xflags into xfs_ip2xflags
Quoted 10 lines · Christoph Hellwig
Quoted 7 lines · Darrick J. Wong
Quoted 3 lines · Christoph Hellwig
Merge
_xfs_dic2xflagsinto its only caller.Signed-off-by Christoph Hellwig <[email protected]>/me wonders if/how this will clash with Miklos' fileattr series, but eh, whatever, I don't think it will, and if it does it's easy enough to fix.
Feel free to drop the patch for now, it is not in any way urgent.
I'll take it for now, since I have no idea if that fileattr series is targeted for 5.13.
--D