remove the di_version icdinode field v3
Hi all,
this series remove the not really needed ic_version field from the icdinode structure.
Changes since v2:
- fix a commit message typo
- rename xfs_sb_version_has_large_dinode to xfs_sb_version_has_v3inode
- move xfs_dinode_good_version next to xfs_sb_version_has_v3inode
- pass the sb instead of xfs_mount to XFS_DINODE_SIZE
Changes since v1:
- split into multiple patches
- add a new xfs_sb_version_has_large_dinode helper instead of using xfs_sb_version_hascrc
- add a comment about the relationship of file system and dinode versions
- add a few more trivial cleanups
PATCH 1/5 xfs: add a new xfs_sb_version_has_v3inode helper
Add a new wrapper to check if a file system supports the v3 inode format with a larger dinode core. Previously we used xfs_sb_version_hascrc for that, which is technically correct but a little confusing to read.
Also move xfs_dinode_good_version next to xfs_sb_version_has_v3inode so that we have one place that documents the superblock version to inode version relationship.
--- fs/xfs/libxfs/xfs_format.h | 17 +++++++++++++++++ fs/xfs/libxfs/xfs_ialloc.c | 4 ++-- fs/xfs/libxfs/xfs_inode_buf.c | 17 +++-------------- fs/xfs/libxfs/xfs_inode_buf.h | 2 -- fs/xfs/libxfs/xfs_trans_resv.c | 2 +- fs/xfs/xfs_buf_item.c | 2 +- fs/xfs/xfs_log_recover.c | 2 +- 7 files changed, 25 insertions(+), 21 deletions(-)
fs/xfs/libxfs/xfs_format.h +17 -0
@@ -497,6 +497,23 @@ static inline bool xfs_sb_version_hascrc(struct xfs_sb *sbp)return XFS_SB_VERSION_NUM (sbp) ==XFS_SB_VERSION_5 ; } +/* +* v5 file systems support V3 inodes only, earlier file systems support +* v2 and v1 inodes. +*/ +static inline bool xfs_sb_version_has_v3inode (struct xfs_sb *sbp) +{ +return XFS_SB_VERSION_NUM (sbp) ==XFS_SB_VERSION_5 ; +} + +static inline bool xfs_dinode_good_version (struct xfs_sb *sbp, +uint8_t version) +{ +if (xfs_sb_version_has_v3inode (sbp)) +return version ==3 ; +return version ==1 || version ==2 ; +} +static inline bool xfs_sb_version_has_pquotino (struct xfs_sb *sbp) {return XFS_SB_VERSION_NUM (sbp) ==XFS_SB_VERSION_5 ;
fs/xfs/libxfs/xfs_ialloc.c +2 -2
@@ -304,7 +304,7 @@ xfs_ialloc_inode_init(* That means for v3 inode we log the entire buffer rather than just the * inode cores. */ -if (xfs_sb_version_hascrc (&mp->m_sb)) { +if (xfs_sb_version_has_v3inode (&mp->m_sb)) { version =3 ; ino =XFS_AGINO_TO_INO (mp, agno,XFS_AGB_TO_AGINO (mp, agbno));
@@ -2872,7 +2872,7 @@ xfs_ialloc_setup_geometry(* cannot change the behavior. */ igeo->inode_cluster_size_raw =XFS_INODE_BIG_CLUSTER_SIZE ; -if (xfs_sb_version_hascrc (&mp->m_sb)) { +if (xfs_sb_version_has_v3inode (&mp->m_sb)) {int new_size = igeo->inode_cluster_size_raw; new_size *= mp->m_sb.sb_inodesize /XFS_DINODE_MIN_SIZE ;
fs/xfs/libxfs/xfs_inode_buf.c +3 -14
@@ -44,17 +44,6 @@ xfs_inobp_check( }#endif -bool -xfs_dinode_good_version ( -struct xfs_mount *mp, -__u8 version) -{ -if (xfs_sb_version_hascrc (&mp->m_sb)) -return version ==3 ; - -return version ==1 || version ==2 ; -} -/* * If we are doing readahead on an inode buffer, we might be in log recovery * reading an inode allocation buffer that hasn't yet been replayed, and hence
@@ -93,7 +82,7 @@ xfs_inode_buf_verify( dip =xfs_buf_offset (bp, (i << mp->m_sb.sb_inodelog)); unlinked_ino =be32_to_cpu (dip->di_next_unlinked); di_ok =xfs_verify_magic16 (bp, dip->di_magic) && -xfs_dinode_good_version (mp, dip->di_version) && +xfs_dinode_good_version (&mp->m_sb, dip->di_version) &&xfs_verify_agino_or_null (mp, agno, unlinked_ino);if (unlikely (XFS_TEST_ERROR (!di_ok, mp,XFS_ERRTAG_ITOBP_INOTOBP ))) {
@@ -454,7 +443,7 @@ xfs_dinode_verify(/* Verify v3 integrity information first */ if (dip->di_version >=3 ) { -if (!xfs_sb_version_hascrc (&mp->m_sb)) +if (!xfs_sb_version_has_v3inode (&mp->m_sb))return __this_address;if (!xfs_verify_cksum ((char *)dip, mp->m_sb.sb_inodesize,XFS_DINODE_CRC_OFF ))
@@ -629,7 +618,7 @@ xfs_iread(/* shortcut IO on inode allocation if possible */ if ((iget_flags &XFS_IGET_CREATE ) && -xfs_sb_version_hascrc (&mp->m_sb) && +xfs_sb_version_has_v3inode (&mp->m_sb) && !(mp->m_flags &XFS_MOUNT_IKEEP )) {VFS_I (ip)->i_generation =prandom_u32 (); ip->i_d.di_version =3 ;
fs/xfs/libxfs/xfs_inode_buf.h +0 -2
@@ -59,8 +59,6 @@ void xfs_inode_from_disk(struct xfs_inode *ip, struct xfs_dinode *from);void xfs_log_dinode_to_disk (struct xfs_log_dinode *from,struct xfs_dinode *to); -bool xfs_dinode_good_version (struct xfs_mount *mp,__u8 version); -#if defined(DEBUG )void xfs_inobp_check (struct xfs_mount *,struct xfs_buf *);#else
fs/xfs/libxfs/xfs_trans_resv.c +1 -1
@@ -187,7 +187,7 @@ xfs_calc_inode_chunk_res( XFS_FSB_TO_B(mp, 1));if (alloc) {/* icreate tx uses ordered buffers */ -if (xfs_sb_version_hascrc (&mp->m_sb)) +if (xfs_sb_version_has_v3inode (&mp->m_sb))return res; size =XFS_FSB_TO_B (mp,1 ); }
fs/xfs/xfs_buf_item.c +1 -1
@@ -345,7 +345,7 @@ xfs_buf_item_format(* occurs during recovery. */ if (bip->bli_flags &XFS_BLI_INODE_BUF ) { -if (xfs_sb_version_hascrc (&lip->li_mountp->m_sb) || +if (xfs_sb_version_has_v3inode (&lip->li_mountp->m_sb) || !((bip->bli_flags &XFS_BLI_INODE_ALLOC_BUF ) &&xfs_log_item_in_current_chkpt (lip))) bip->__bli_format.blf_flags |=XFS_BLF_INODE_BUF ;
fs/xfs/xfs_log_recover.c +1 -1
@@ -2997,7 +2997,7 @@ xlog_recover_inode_pass2(* superblock flag to determine whether we need to look at di_flushiter * to skip replay when the on disk inode is newer than the log one */ -if (!xfs_sb_version_hascrc (&mp->m_sb) && +if (!xfs_sb_version_has_v3inode (&mp->m_sb) && ldip->di_flushiter <be16_to_cpu (dip->di_flushiter)) {/* * Deal with the wrap case, DI_MAX_FLUSH is less
Signature · 1 line
2.24.1
Re: [PATCH 1/5] xfs: add a new xfs_sb_version_has_v3inode helper
Quoted 8 lines · Christoph Hellwig
Add a new wrapper to check if a file system supports the v3 inode format with a larger dinode core. Previously we used
xfs_sb_version_hascrcfor that, which is technically correct but a little confusing to read.Also move
xfs_dinode_good_versionnext toxfs_sb_version_has_v3inodeso that we have one place that documents the superblock version to inode version relationship.
The changes look good to me,
Quoted 163 lines
Signed-off-by Christoph Hellwig <[email protected]>--- fs/xfs/libxfs/xfs_format.h | 17 +++++++++++++++++ fs/xfs/libxfs/xfs_ialloc.c | 4 ++-- fs/xfs/libxfs/xfs_inode_buf.c | 17 +++-------------- fs/xfs/libxfs/xfs_inode_buf.h | 2 -- fs/xfs/libxfs/xfs_trans_resv.c | 2 +- fs/xfs/xfs_buf_item.c | 2 +- fs/xfs/xfs_log_recover.c | 2 +- 7 files changed, 25 insertions(+), 21 deletions(-)fs/xfs/libxfs/xfs_format.h +17
-0@@ -497,6 +497,23 @@ static inline bool xfs_sb_version_hascrc(struct xfs_sb *sbp)return XFS_SB_VERSION_NUM (sbp) ==XFS_SB_VERSION_5 ; } +/* +* v5 file systems support V3 inodes only, earlier file systems support +* v2 and v1 inodes. +*/ +static inline bool xfs_sb_version_has_v3inode (struct xfs_sb *sbp) +{ +return XFS_SB_VERSION_NUM (sbp) ==XFS_SB_VERSION_5 ; +} + +static inline bool xfs_dinode_good_version (struct xfs_sb *sbp, +uint8_t version) +{ +if (xfs_sb_version_has_v3inode (sbp)) +return version ==3 ; +return version ==1 || version ==2 ; +} +static inline bool xfs_sb_version_has_pquotino (struct xfs_sb *sbp) {return XFS_SB_VERSION_NUM (sbp) ==XFS_SB_VERSION_5 ;fs/xfs/libxfs/xfs_ialloc.c +2
-2@@ -304,7 +304,7 @@ xfs_ialloc_inode_init(* That means for v3 inode we log the entire buffer rather than just the * inode cores. */ -if (xfs_sb_version_hascrc (&mp->m_sb)) { +if (xfs_sb_version_has_v3inode (&mp->m_sb)) { version =3 ; ino =XFS_AGINO_TO_INO (mp, agno,XFS_AGB_TO_AGINO (mp, agbno));@@ -2872,7 +2872,7 @@ xfs_ialloc_setup_geometry(* cannot change the behavior. */ igeo->inode_cluster_size_raw =XFS_INODE_BIG_CLUSTER_SIZE ; -if (xfs_sb_version_hascrc (&mp->m_sb)) { +if (xfs_sb_version_has_v3inode (&mp->m_sb)) {int new_size = igeo->inode_cluster_size_raw; new_size *= mp->m_sb.sb_inodesize /XFS_DINODE_MIN_SIZE ;fs/xfs/libxfs/xfs_inode_buf.c +3
-14@@ -44,17 +44,6 @@ xfs_inobp_check( }#endif -bool -xfs_dinode_good_version ( -struct xfs_mount *mp, -__u8 version) -{ -if (xfs_sb_version_hascrc (&mp->m_sb)) -return version ==3 ; - -return version ==1 || version ==2 ; -} -/* * If we are doing readahead on an inode buffer, we might be in log recovery * reading an inode allocation buffer that hasn't yet been replayed, and hence @@ -93,7 +82,7 @@ xfs_inode_buf_verify( dip =xfs_buf_offset (bp, (i << mp->m_sb.sb_inodelog)); unlinked_ino =be32_to_cpu (dip->di_next_unlinked); di_ok =xfs_verify_magic16 (bp, dip->di_magic) && -xfs_dinode_good_version (mp, dip->di_version) && +xfs_dinode_good_version (&mp->m_sb, dip->di_version) &&xfs_verify_agino_or_null (mp, agno, unlinked_ino);if (unlikely (XFS_TEST_ERROR (!di_ok, mp,XFS_ERRTAG_ITOBP_INOTOBP ))) {@@ -454,7 +443,7 @@ xfs_dinode_verify(/* Verify v3 integrity information first */ if (dip->di_version >=3 ) { -if (!xfs_sb_version_hascrc (&mp->m_sb)) +if (!xfs_sb_version_has_v3inode (&mp->m_sb))return __this_address;if (!xfs_verify_cksum ((char *)dip, mp->m_sb.sb_inodesize,XFS_DINODE_CRC_OFF ))@@ -629,7 +618,7 @@ xfs_iread(/* shortcut IO on inode allocation if possible */ if ((iget_flags &XFS_IGET_CREATE ) && -xfs_sb_version_hascrc (&mp->m_sb) && +xfs_sb_version_has_v3inode (&mp->m_sb) && !(mp->m_flags &XFS_MOUNT_IKEEP )) {VFS_I (ip)->i_generation =prandom_u32 (); ip->i_d.di_version =3 ;fs/xfs/libxfs/xfs_inode_buf.h +0
-2@@ -59,8 +59,6 @@ void xfs_inode_from_disk(struct xfs_inode *ip, struct xfs_dinode *from);void xfs_log_dinode_to_disk (struct xfs_log_dinode *from,struct xfs_dinode *to); -bool xfs_dinode_good_version (struct xfs_mount *mp,__u8 version); -#if defined(DEBUG )void xfs_inobp_check (struct xfs_mount *,struct xfs_buf *);#else fs/xfs/libxfs/xfs_trans_resv.c +1
-1@@ -187,7 +187,7 @@ xfs_calc_inode_chunk_res( XFS_FSB_TO_B(mp, 1));if (alloc) {/* icreate tx uses ordered buffers */ -if (xfs_sb_version_hascrc (&mp->m_sb)) +if (xfs_sb_version_has_v3inode (&mp->m_sb))return res; size =XFS_FSB_TO_B (mp,1 ); }fs/xfs/xfs_buf_item.c +1
-1@@ -345,7 +345,7 @@ xfs_buf_item_format(* occurs during recovery. */ if (bip->bli_flags &XFS_BLI_INODE_BUF ) { -if (xfs_sb_version_hascrc (&lip->li_mountp->m_sb) || +if (xfs_sb_version_has_v3inode (&lip->li_mountp->m_sb) || !((bip->bli_flags &XFS_BLI_INODE_ALLOC_BUF ) &&xfs_log_item_in_current_chkpt (lip))) bip->__bli_format.blf_flags |=XFS_BLF_INODE_BUF ;fs/xfs/xfs_log_recover.c +1
-1@@ -2997,7 +2997,7 @@ xlog_recover_inode_pass2(* superblock flag to determine whether we need to look at di_flushiter * to skip replay when the on disk inode is newer than the log one */ -if (!xfs_sb_version_hascrc (&mp->m_sb) && +if (!xfs_sb_version_has_v3inode (&mp->m_sb) && ldip->di_flushiter <be16_to_cpu (dip->di_flushiter)) {/* * Deal with the wrap case, DI_MAX_FLUSH is less
Signature · 1 line
chandan
Re: [PATCH 1/5] xfs: add a new xfs_sb_version_has_v3inode helper
In reply to Christoph HellwigQuoted 9 lines · Christoph Hellwig
Add a new wrapper to check if a file system supports the v3 inode format with a larger dinode core. Previously we used
xfs_sb_version_hascrcfor that, which is technically correct but a little confusing to read.Also move
xfs_dinode_good_versionnext toxfs_sb_version_has_v3inodeso that we have one place that documents the superblock version to inode version relationship.Signed-off-by Christoph Hellwig <[email protected]>
Looks ok, will test...
--D
Quoted 164 lines
--- fs/xfs/libxfs/xfs_format.h | 17 +++++++++++++++++ fs/xfs/libxfs/xfs_ialloc.c | 4 ++-- fs/xfs/libxfs/xfs_inode_buf.c | 17 +++-------------- fs/xfs/libxfs/xfs_inode_buf.h | 2 -- fs/xfs/libxfs/xfs_trans_resv.c | 2 +- fs/xfs/xfs_buf_item.c | 2 +- fs/xfs/xfs_log_recover.c | 2 +- 7 files changed, 25 insertions(+), 21 deletions(-)fs/xfs/libxfs/xfs_format.h +17
-0@@ -497,6 +497,23 @@ static inline bool xfs_sb_version_hascrc(struct xfs_sb *sbp)return XFS_SB_VERSION_NUM (sbp) ==XFS_SB_VERSION_5 ; } +/* +* v5 file systems support V3 inodes only, earlier file systems support +* v2 and v1 inodes. +*/ +static inline bool xfs_sb_version_has_v3inode (struct xfs_sb *sbp) +{ +return XFS_SB_VERSION_NUM (sbp) ==XFS_SB_VERSION_5 ; +} + +static inline bool xfs_dinode_good_version (struct xfs_sb *sbp, +uint8_t version) +{ +if (xfs_sb_version_has_v3inode (sbp)) +return version ==3 ; +return version ==1 || version ==2 ; +} +static inline bool xfs_sb_version_has_pquotino (struct xfs_sb *sbp) {return XFS_SB_VERSION_NUM (sbp) ==XFS_SB_VERSION_5 ;fs/xfs/libxfs/xfs_ialloc.c +2
-2@@ -304,7 +304,7 @@ xfs_ialloc_inode_init(* That means for v3 inode we log the entire buffer rather than just the * inode cores. */ -if (xfs_sb_version_hascrc (&mp->m_sb)) { +if (xfs_sb_version_has_v3inode (&mp->m_sb)) { version =3 ; ino =XFS_AGINO_TO_INO (mp, agno,XFS_AGB_TO_AGINO (mp, agbno));@@ -2872,7 +2872,7 @@ xfs_ialloc_setup_geometry(* cannot change the behavior. */ igeo->inode_cluster_size_raw =XFS_INODE_BIG_CLUSTER_SIZE ; -if (xfs_sb_version_hascrc (&mp->m_sb)) { +if (xfs_sb_version_has_v3inode (&mp->m_sb)) {int new_size = igeo->inode_cluster_size_raw; new_size *= mp->m_sb.sb_inodesize /XFS_DINODE_MIN_SIZE ;fs/xfs/libxfs/xfs_inode_buf.c +3
-14@@ -44,17 +44,6 @@ xfs_inobp_check( }#endif -bool -xfs_dinode_good_version ( -struct xfs_mount *mp, -__u8 version) -{ -if (xfs_sb_version_hascrc (&mp->m_sb)) -return version ==3 ; - -return version ==1 || version ==2 ; -} -/* * If we are doing readahead on an inode buffer, we might be in log recovery * reading an inode allocation buffer that hasn't yet been replayed, and hence @@ -93,7 +82,7 @@ xfs_inode_buf_verify( dip =xfs_buf_offset (bp, (i << mp->m_sb.sb_inodelog)); unlinked_ino =be32_to_cpu (dip->di_next_unlinked); di_ok =xfs_verify_magic16 (bp, dip->di_magic) && -xfs_dinode_good_version (mp, dip->di_version) && +xfs_dinode_good_version (&mp->m_sb, dip->di_version) &&xfs_verify_agino_or_null (mp, agno, unlinked_ino);if (unlikely (XFS_TEST_ERROR (!di_ok, mp,XFS_ERRTAG_ITOBP_INOTOBP ))) {@@ -454,7 +443,7 @@ xfs_dinode_verify(/* Verify v3 integrity information first */ if (dip->di_version >=3 ) { -if (!xfs_sb_version_hascrc (&mp->m_sb)) +if (!xfs_sb_version_has_v3inode (&mp->m_sb))return __this_address;if (!xfs_verify_cksum ((char *)dip, mp->m_sb.sb_inodesize,XFS_DINODE_CRC_OFF ))@@ -629,7 +618,7 @@ xfs_iread(/* shortcut IO on inode allocation if possible */ if ((iget_flags &XFS_IGET_CREATE ) && -xfs_sb_version_hascrc (&mp->m_sb) && +xfs_sb_version_has_v3inode (&mp->m_sb) && !(mp->m_flags &XFS_MOUNT_IKEEP )) {VFS_I (ip)->i_generation =prandom_u32 (); ip->i_d.di_version =3 ;fs/xfs/libxfs/xfs_inode_buf.h +0
-2@@ -59,8 +59,6 @@ void xfs_inode_from_disk(struct xfs_inode *ip, struct xfs_dinode *from);void xfs_log_dinode_to_disk (struct xfs_log_dinode *from,struct xfs_dinode *to); -bool xfs_dinode_good_version (struct xfs_mount *mp,__u8 version); -#if defined(DEBUG )void xfs_inobp_check (struct xfs_mount *,struct xfs_buf *);#else fs/xfs/libxfs/xfs_trans_resv.c +1
-1@@ -187,7 +187,7 @@ xfs_calc_inode_chunk_res( XFS_FSB_TO_B(mp, 1));if (alloc) {/* icreate tx uses ordered buffers */ -if (xfs_sb_version_hascrc (&mp->m_sb)) +if (xfs_sb_version_has_v3inode (&mp->m_sb))return res; size =XFS_FSB_TO_B (mp,1 ); }fs/xfs/xfs_buf_item.c +1
-1@@ -345,7 +345,7 @@ xfs_buf_item_format(* occurs during recovery. */ if (bip->bli_flags &XFS_BLI_INODE_BUF ) { -if (xfs_sb_version_hascrc (&lip->li_mountp->m_sb) || +if (xfs_sb_version_has_v3inode (&lip->li_mountp->m_sb) || !((bip->bli_flags &XFS_BLI_INODE_ALLOC_BUF ) &&xfs_log_item_in_current_chkpt (lip))) bip->__bli_format.blf_flags |=XFS_BLF_INODE_BUF ;fs/xfs/xfs_log_recover.c +1
-1@@ -2997,7 +2997,7 @@ xlog_recover_inode_pass2(* superblock flag to determine whether we need to look at di_flushiter * to skip replay when the on disk inode is newer than the log one */ -if (!xfs_sb_version_hascrc (&mp->m_sb) && +if (!xfs_sb_version_has_v3inode (&mp->m_sb) && ldip->di_flushiter <be16_to_cpu (dip->di_flushiter)) {/* * Deal with the wrap case, DI_MAX_FLUSH is less Signature · 1 line
2.24.1
Re: [PATCH 1/5] xfs: add a new xfs_sb_version_has_v3inode helper
In reply to Christoph HellwigQuoted 10 lines · Christoph Hellwig
Add a new wrapper to check if a file system supports the v3 inode format with a larger dinode core. Previously we used
xfs_sb_version_hascrcfor that, which is technically correct but a little confusing to read.Also move
xfs_dinode_good_versionnext toxfs_sb_version_has_v3inodeso that we have one place that documents the superblock version to inode version relationship.Signed-off-by Christoph Hellwig <[email protected]>---
Quoted 163 lines
fs/xfs/libxfs/xfs_format.h | 17 +++++++++++++++++ fs/xfs/libxfs/xfs_ialloc.c | 4 ++-- fs/xfs/libxfs/xfs_inode_buf.c | 17 +++-------------- fs/xfs/libxfs/xfs_inode_buf.h | 2 -- fs/xfs/libxfs/xfs_trans_resv.c | 2 +- fs/xfs/xfs_buf_item.c | 2 +- fs/xfs/xfs_log_recover.c | 2 +- 7 files changed, 25 insertions(+), 21 deletions(-)fs/xfs/libxfs/xfs_format.h +17
-0@@ -497,6 +497,23 @@ static inline bool xfs_sb_version_hascrc(struct xfs_sb *sbp)return XFS_SB_VERSION_NUM (sbp) ==XFS_SB_VERSION_5 ; } +/* +* v5 file systems support V3 inodes only, earlier file systems support +* v2 and v1 inodes. +*/ +static inline bool xfs_sb_version_has_v3inode (struct xfs_sb *sbp) +{ +return XFS_SB_VERSION_NUM (sbp) ==XFS_SB_VERSION_5 ; +} + +static inline bool xfs_dinode_good_version (struct xfs_sb *sbp, +uint8_t version) +{ +if (xfs_sb_version_has_v3inode (sbp)) +return version ==3 ; +return version ==1 || version ==2 ; +} +static inline bool xfs_sb_version_has_pquotino (struct xfs_sb *sbp) {return XFS_SB_VERSION_NUM (sbp) ==XFS_SB_VERSION_5 ;fs/xfs/libxfs/xfs_ialloc.c +2
-2@@ -304,7 +304,7 @@ xfs_ialloc_inode_init(* That means for v3 inode we log the entire buffer rather than just the * inode cores. */ -if (xfs_sb_version_hascrc (&mp->m_sb)) { +if (xfs_sb_version_has_v3inode (&mp->m_sb)) { version =3 ; ino =XFS_AGINO_TO_INO (mp, agno,XFS_AGB_TO_AGINO (mp, agbno));@@ -2872,7 +2872,7 @@ xfs_ialloc_setup_geometry(* cannot change the behavior. */ igeo->inode_cluster_size_raw =XFS_INODE_BIG_CLUSTER_SIZE ; -if (xfs_sb_version_hascrc (&mp->m_sb)) { +if (xfs_sb_version_has_v3inode (&mp->m_sb)) {int new_size = igeo->inode_cluster_size_raw; new_size *= mp->m_sb.sb_inodesize /XFS_DINODE_MIN_SIZE ;fs/xfs/libxfs/xfs_inode_buf.c +3
-14@@ -44,17 +44,6 @@ xfs_inobp_check( }#endif -bool -xfs_dinode_good_version ( -struct xfs_mount *mp, -__u8 version) -{ -if (xfs_sb_version_hascrc (&mp->m_sb)) -return version ==3 ; - -return version ==1 || version ==2 ; -} -/* * If we are doing readahead on an inode buffer, we might be in log recovery * reading an inode allocation buffer that hasn't yet been replayed, and hence @@ -93,7 +82,7 @@ xfs_inode_buf_verify( dip =xfs_buf_offset (bp, (i << mp->m_sb.sb_inodelog)); unlinked_ino =be32_to_cpu (dip->di_next_unlinked); di_ok =xfs_verify_magic16 (bp, dip->di_magic) && -xfs_dinode_good_version (mp, dip->di_version) && +xfs_dinode_good_version (&mp->m_sb, dip->di_version) &&xfs_verify_agino_or_null (mp, agno, unlinked_ino);if (unlikely (XFS_TEST_ERROR (!di_ok, mp,XFS_ERRTAG_ITOBP_INOTOBP ))) {@@ -454,7 +443,7 @@ xfs_dinode_verify(/* Verify v3 integrity information first */ if (dip->di_version >=3 ) { -if (!xfs_sb_version_hascrc (&mp->m_sb)) +if (!xfs_sb_version_has_v3inode (&mp->m_sb))return __this_address;if (!xfs_verify_cksum ((char *)dip, mp->m_sb.sb_inodesize,XFS_DINODE_CRC_OFF ))@@ -629,7 +618,7 @@ xfs_iread(/* shortcut IO on inode allocation if possible */ if ((iget_flags &XFS_IGET_CREATE ) && -xfs_sb_version_hascrc (&mp->m_sb) && +xfs_sb_version_has_v3inode (&mp->m_sb) && !(mp->m_flags &XFS_MOUNT_IKEEP )) {VFS_I (ip)->i_generation =prandom_u32 (); ip->i_d.di_version =3 ;fs/xfs/libxfs/xfs_inode_buf.h +0
-2@@ -59,8 +59,6 @@ void xfs_inode_from_disk(struct xfs_inode *ip, struct xfs_dinode *from);void xfs_log_dinode_to_disk (struct xfs_log_dinode *from,struct xfs_dinode *to); -bool xfs_dinode_good_version (struct xfs_mount *mp,__u8 version); -#if defined(DEBUG )void xfs_inobp_check (struct xfs_mount *,struct xfs_buf *);#else fs/xfs/libxfs/xfs_trans_resv.c +1
-1@@ -187,7 +187,7 @@ xfs_calc_inode_chunk_res( XFS_FSB_TO_B(mp, 1));if (alloc) {/* icreate tx uses ordered buffers */ -if (xfs_sb_version_hascrc (&mp->m_sb)) +if (xfs_sb_version_has_v3inode (&mp->m_sb))return res; size =XFS_FSB_TO_B (mp,1 ); }fs/xfs/xfs_buf_item.c +1
-1@@ -345,7 +345,7 @@ xfs_buf_item_format(* occurs during recovery. */ if (bip->bli_flags &XFS_BLI_INODE_BUF ) { -if (xfs_sb_version_hascrc (&lip->li_mountp->m_sb) || +if (xfs_sb_version_has_v3inode (&lip->li_mountp->m_sb) || !((bip->bli_flags &XFS_BLI_INODE_ALLOC_BUF ) &&xfs_log_item_in_current_chkpt (lip))) bip->__bli_format.blf_flags |=XFS_BLF_INODE_BUF ;fs/xfs/xfs_log_recover.c +1
-1@@ -2997,7 +2997,7 @@ xlog_recover_inode_pass2(* superblock flag to determine whether we need to look at di_flushiter * to skip replay when the on disk inode is newer than the log one */ -if (!xfs_sb_version_hascrc (&mp->m_sb) && +if (!xfs_sb_version_has_v3inode (&mp->m_sb) && ldip->di_flushiter <be16_to_cpu (dip->di_flushiter)) {/* * Deal with the wrap case, DI_MAX_FLUSH is less Signature · 1 line
2.24.1
PATCH 2/5 xfs: only check the superblock version for dinode size calculation
In reply to Christoph HellwigThe size of the dinode structure is only dependent on the file system version, so instead of checking the individual inode version just use the newly added xfs_sb_version_has_large_dinode helper, and simplify various calling conventions.
--- fs/xfs/libxfs/xfs_attr_leaf.c | 5 ++--- fs/xfs/libxfs/xfs_bmap.c | 10 ++++------ fs/xfs/libxfs/xfs_format.h | 16 ++++++++-------- fs/xfs/libxfs/xfs_ialloc.c | 2 +- fs/xfs/libxfs/xfs_inode_buf.c | 2 +- fs/xfs/libxfs/xfs_inode_fork.c | 2 +- fs/xfs/libxfs/xfs_inode_fork.h | 9 ++------- fs/xfs/libxfs/xfs_log_format.h | 10 ++++------ fs/xfs/xfs_inode_item.c | 4 ++-- fs/xfs/xfs_log_recover.c | 2 +- fs/xfs/xfs_symlink.c | 2 +- 11 files changed, 27 insertions(+), 37 deletions(-)
fs/xfs/libxfs/xfs_attr_leaf.c +2 -3
@@ -537,7 +537,7 @@ xfs_attr_shortform_bytesfit(int offset;/* rounded down */ - offset = (XFS_LITINO (mp, dp->i_d.di_version) - bytes) >>3 ; + offset = (XFS_LITINO (mp) - bytes) >>3 ;if (dp->i_d.di_format ==XFS_DINODE_FMT_DEV ) { minforkoff =roundup (sizeof (xfs_dev_t),8 ) >>3 ;
@@ -604,8 +604,7 @@ xfs_attr_shortform_bytesfit( minforkoff =roundup (minforkoff,8 ) >>3 ;/* attr fork btree root can have at least this many key/ptr pairs */ - maxforkoff =XFS_LITINO (mp, dp->i_d.di_version) - -XFS_BMDR_SPACE_CALC (MINABTPTRS ); + maxforkoff =XFS_LITINO (mp) -XFS_BMDR_SPACE_CALC (MINABTPTRS ); maxforkoff = maxforkoff >>3 ;/* rounded down */ if (offset >= maxforkoff)
fs/xfs/libxfs/xfs_bmap.c +4 -6
@@ -193,14 +193,12 @@ xfs_default_attroffset(struct xfs_mount *mp = ip->i_mount;uint offset; -if (mp->m_sb.sb_inodesize ==256 ) { - offset =XFS_LITINO (mp, ip->i_d.di_version) - -XFS_BMDR_SPACE_CALC (MINABTPTRS ); - }else { +if (mp->m_sb.sb_inodesize ==256 ) + offset =XFS_LITINO (mp) -XFS_BMDR_SPACE_CALC (MINABTPTRS ); +else offset =XFS_BMDR_SPACE_CALC (6 *MINABTPTRS ); - } -ASSERT (offset <XFS_LITINO (mp, ip->i_d.di_version)); +ASSERT (offset <XFS_LITINO (mp));return offset; }
fs/xfs/libxfs/xfs_format.h +8 -8
@@ -954,8 +954,12 @@ enum xfs_dinode_fmt {/* * Inode size for given fs. */ -#define XFS_LITINO (mp, version) \ - ((int)(((mp)->m_sb.sb_inodesize) - xfs_dinode_size(version))) +#define XFS_DINODE_SIZE (sbp) \ + (xfs_sb_version_has_v3inode(sbp) ? \ + sizeof(struct xfs_dinode) : \ + offsetof(struct xfs_dinode, di_crc)) +#define XFS_LITINO (mp) \ + ((mp)->m_sb.sb_inodesize - XFS_DINODE_SIZE(&(mp)->m_sb))/* * Inode data & attribute fork sizes, per inode.
@@ -964,13 +968,9 @@ enum xfs_dinode_fmt {#define XFS_DFORK_BOFF (dip) ((int)((dip)->di_forkoff << 3))#define XFS_DFORK_DSIZE (dip,mp) \ - (XFS_DFORK_Q(dip) ? \ - XFS_DFORK_BOFF(dip) : \ - XFS_LITINO(mp, (dip)->di_version)) + (XFS_DFORK_Q(dip) ? XFS_DFORK_BOFF(dip) : XFS_LITINO(mp))#define XFS_DFORK_ASIZE (dip,mp) \ - (XFS_DFORK_Q(dip) ? \ - XFS_LITINO(mp, (dip)->di_version) - XFS_DFORK_BOFF(dip) : \ - 0) + (XFS_DFORK_Q(dip) ? XFS_LITINO(mp) - XFS_DFORK_BOFF(dip) : 0)#define XFS_DFORK_SIZE (dip,mp,w) \ ((w) == XFS_DATA_FORK ? \ XFS_DFORK_DSIZE(dip, mp) : \
fs/xfs/libxfs/xfs_ialloc.c +1 -1
@@ -339,7 +339,7 @@ xfs_ialloc_inode_init(xfs_buf_zero (fbuf,0 ,BBTOB (fbuf->b_length));for (i =0 ; i <M_IGEO (mp)->inodes_per_cluster; i++) {int ioffset = i << mp->m_sb.sb_inodelog; -uint isize =xfs_dinode_size (version); +uint isize =XFS_DINODE_SIZE (&mp->m_sb); free =xfs_make_iptr (mp, fbuf, i); free->di_magic =cpu_to_be16 (XFS_DINODE_MAGIC );
fs/xfs/libxfs/xfs_inode_buf.c +1 -1
@@ -417,7 +417,7 @@ xfs_dinode_verify_forkoff(case XFS_DINODE_FMT_LOCAL :/* fall through ... */ case XFS_DINODE_FMT_EXTENTS :/* fall through ... */ case XFS_DINODE_FMT_BTREE : -if (dip->di_forkoff >= (XFS_LITINO (mp, dip->di_version) >>3 )) +if (dip->di_forkoff >= (XFS_LITINO (mp) >>3 ))return __this_address;break ;default :
fs/xfs/libxfs/xfs_inode_fork.c +1 -1
@@ -183,7 +183,7 @@ xfs_iformat_local(*/ if (unlikely (size >XFS_DFORK_SIZE (dip, ip->i_mount, whichfork))) {xfs_warn (ip->i_mount, -"corrupt inode %Lu (bad size %d for local fork, size = %d)." , +"corrupt inode %Lu (bad size %d for local fork, size = %zd)." , (unsigned long long ) ip->i_ino, size,XFS_DFORK_SIZE (dip, ip->i_mount, whichfork)); xfs_inode_verifier_error(ip, -EFSCORRUPTED,
fs/xfs/libxfs/xfs_inode_fork.h +2 -7
@@ -46,14 +46,9 @@ struct xfs_ifork { (ip)->i_afp : \ (ip)->i_cowfp))#define XFS_IFORK_DSIZE (ip) \ - (XFS_IFORK_Q(ip) ? \ - XFS_IFORK_BOFF(ip) : \ - XFS_LITINO((ip)->i_mount, (ip)->i_d.di_version)) + (XFS_IFORK_Q(ip) ? XFS_IFORK_BOFF(ip) : XFS_LITINO((ip)->i_mount))#define XFS_IFORK_ASIZE (ip) \ - (XFS_IFORK_Q(ip) ? \ - XFS_LITINO((ip)->i_mount, (ip)->i_d.di_version) - \ - XFS_IFORK_BOFF(ip) : \ - 0) + (XFS_IFORK_Q(ip) ? XFS_LITINO((ip)->i_mount) - XFS_IFORK_BOFF(ip) : 0)#define XFS_IFORK_SIZE (ip,w) \ ((w) == XFS_DATA_FORK ? \ XFS_IFORK_DSIZE(ip) : \
fs/xfs/libxfs/xfs_log_format.h +4 -6
@@ -424,12 +424,10 @@ struct xfs_log_dinode {/* structure must be padded to 64 bit alignment */ }; -static inline uint xfs_log_dinode_size (int version) -{ -if (version ==3 ) -return sizeof (struct xfs_log_dinode ); -return offsetof(struct xfs_log_dinode , di_next_unlinked); -} +#define xfs_log_dinode_size (mp) \ + (xfs_sb_version_has_v3inode(&(mp)->m_sb) ? \ + sizeof(struct xfs_log_dinode) : \ + offsetof(struct xfs_log_dinode, di_next_unlinked))/* * Buffer Log Format definitions
fs/xfs/xfs_inode_item.c +2 -2
@@ -125,7 +125,7 @@ xfs_inode_item_size( *nvecs +=2 ; *nbytes +=sizeof (struct xfs_inode_log_format ) + -xfs_log_dinode_size (ip->i_d.di_version); +xfs_log_dinode_size (ip->i_mount);xfs_inode_item_data_fork_size (iip, nvecs, nbytes);if (XFS_IFORK_Q (ip))
@@ -370,7 +370,7 @@ xfs_inode_item_format_core( dic =xlog_prepare_iovec (lv, vecp,XLOG_REG_TYPE_ICORE );xfs_inode_to_log_dinode (ip, dic, ip->i_itemp->ili_item.li_lsn); -xlog_finish_iovec (lv, *vecp,xfs_log_dinode_size (ip->i_d.di_version)); +xlog_finish_iovec (lv, *vecp,xfs_log_dinode_size (ip->i_mount)); }/*
fs/xfs/xfs_log_recover.c +1 -1
@@ -3068,7 +3068,7 @@ xlog_recover_inode_pass2( error = -EFSCORRUPTED ; goto out_release; } - isize =xfs_log_dinode_size (ldip->di_version); + isize =xfs_log_dinode_size (mp);if (unlikely (item->ri_buf[1 ].i_len > isize)) { XFS_CORRUPTION_ERROR("xlog_recover_inode_pass2(7)", XFS_ERRLEVEL_LOW, mp, ldip,
fs/xfs/xfs_symlink.c +1 -1
@@ -192,7 +192,7 @@ xfs_symlink(* The symlink will fit into the inode data fork? * There can't be any attributes so we get the whole variable part. */ -if (pathlen <=XFS_LITINO (mp, dp->i_d.di_version)) +if (pathlen <=XFS_LITINO (mp)) fs_blocks =0 ;else fs_blocks =xfs_symlink_blocks (mp, pathlen);
Signature · 1 line
2.24.1
Re: [PATCH 2/5] xfs: only check the superblock version for dinode size calculation
Quoted 8 lines · Christoph Hellwig
The size of the dinode structure is only dependent on the file system version, so instead of checking the individual inode version just use the newly added
xfs_sb_version_has_large_dinodehelper, and simplify various calling conventions.Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Brian Foster <[email protected]>Reviewed-by Chandan Rajendra <[email protected]>
Blergh macros,
--D
Quoted 227 lines
--- fs/xfs/libxfs/xfs_attr_leaf.c | 5 ++--- fs/xfs/libxfs/xfs_bmap.c | 10 ++++------ fs/xfs/libxfs/xfs_format.h | 16 ++++++++-------- fs/xfs/libxfs/xfs_ialloc.c | 2 +- fs/xfs/libxfs/xfs_inode_buf.c | 2 +- fs/xfs/libxfs/xfs_inode_fork.c | 2 +- fs/xfs/libxfs/xfs_inode_fork.h | 9 ++------- fs/xfs/libxfs/xfs_log_format.h | 10 ++++------ fs/xfs/xfs_inode_item.c | 4 ++-- fs/xfs/xfs_log_recover.c | 2 +- fs/xfs/xfs_symlink.c | 2 +- 11 files changed, 27 insertions(+), 37 deletions(-)fs/xfs/libxfs/xfs_attr_leaf.c +2
-3@@ -537,7 +537,7 @@ xfs_attr_shortform_bytesfit(int offset;/* rounded down */ - offset = (XFS_LITINO (mp, dp->i_d.di_version) - bytes) >>3 ; + offset = (XFS_LITINO (mp) - bytes) >>3 ;if (dp->i_d.di_format ==XFS_DINODE_FMT_DEV ) { minforkoff =roundup (sizeof (xfs_dev_t),8 ) >>3 ;@@ -604,8 +604,7 @@ xfs_attr_shortform_bytesfit( minforkoff =roundup (minforkoff,8 ) >>3 ;/* attr fork btree root can have at least this many key/ptr pairs */ - maxforkoff =XFS_LITINO (mp, dp->i_d.di_version) - -XFS_BMDR_SPACE_CALC (MINABTPTRS ); + maxforkoff =XFS_LITINO (mp) -XFS_BMDR_SPACE_CALC (MINABTPTRS ); maxforkoff = maxforkoff >>3 ;/* rounded down */ if (offset >= maxforkoff)fs/xfs/libxfs/xfs_bmap.c +4
-6@@ -193,14 +193,12 @@ xfs_default_attroffset(struct xfs_mount *mp = ip->i_mount;uint offset; -if (mp->m_sb.sb_inodesize ==256 ) { - offset =XFS_LITINO (mp, ip->i_d.di_version) - -XFS_BMDR_SPACE_CALC (MINABTPTRS ); - }else { +if (mp->m_sb.sb_inodesize ==256 ) + offset =XFS_LITINO (mp) -XFS_BMDR_SPACE_CALC (MINABTPTRS ); +else offset =XFS_BMDR_SPACE_CALC (6 *MINABTPTRS ); - } -ASSERT (offset <XFS_LITINO (mp, ip->i_d.di_version)); +ASSERT (offset <XFS_LITINO (mp));return offset; }fs/xfs/libxfs/xfs_format.h +8
-8@@ -954,8 +954,12 @@ enum xfs_dinode_fmt {/* * Inode size for given fs. */ -#define XFS_LITINO (mp, version) \ - ((int)(((mp)->m_sb.sb_inodesize) - xfs_dinode_size(version))) +#define XFS_DINODE_SIZE (sbp) \ + (xfs_sb_version_has_v3inode(sbp) ? \ + sizeof(struct xfs_dinode) : \ + offsetof(struct xfs_dinode, di_crc)) +#define XFS_LITINO (mp) \ + ((mp)->m_sb.sb_inodesize - XFS_DINODE_SIZE(&(mp)->m_sb))/* * Inode data & attribute fork sizes, per inode. @@ -964,13 +968,9 @@ enum xfs_dinode_fmt {#define XFS_DFORK_BOFF (dip) ((int)((dip)->di_forkoff << 3))#define XFS_DFORK_DSIZE (dip,mp) \ - (XFS_DFORK_Q(dip) ? \ - XFS_DFORK_BOFF(dip) : \ - XFS_LITINO(mp, (dip)->di_version)) + (XFS_DFORK_Q(dip) ? XFS_DFORK_BOFF(dip) : XFS_LITINO(mp))#define XFS_DFORK_ASIZE (dip,mp) \ - (XFS_DFORK_Q(dip) ? \ - XFS_LITINO(mp, (dip)->di_version) - XFS_DFORK_BOFF(dip) : \ - 0) + (XFS_DFORK_Q(dip) ? XFS_LITINO(mp) - XFS_DFORK_BOFF(dip) : 0)#define XFS_DFORK_SIZE (dip,mp,w) \ ((w) == XFS_DATA_FORK ? \ XFS_DFORK_DSIZE(dip, mp) : \fs/xfs/libxfs/xfs_ialloc.c +1
-1@@ -339,7 +339,7 @@ xfs_ialloc_inode_init(xfs_buf_zero (fbuf,0 ,BBTOB (fbuf->b_length));for (i =0 ; i <M_IGEO (mp)->inodes_per_cluster; i++) {int ioffset = i << mp->m_sb.sb_inodelog; -uint isize =xfs_dinode_size (version); +uint isize =XFS_DINODE_SIZE (&mp->m_sb); free =xfs_make_iptr (mp, fbuf, i); free->di_magic =cpu_to_be16 (XFS_DINODE_MAGIC );fs/xfs/libxfs/xfs_inode_buf.c +1
-1@@ -417,7 +417,7 @@ xfs_dinode_verify_forkoff(case XFS_DINODE_FMT_LOCAL :/* fall through ... */ case XFS_DINODE_FMT_EXTENTS :/* fall through ... */ case XFS_DINODE_FMT_BTREE : -if (dip->di_forkoff >= (XFS_LITINO (mp, dip->di_version) >>3 )) +if (dip->di_forkoff >= (XFS_LITINO (mp) >>3 ))return __this_address;break ;default :fs/xfs/libxfs/xfs_inode_fork.c +1
-1@@ -183,7 +183,7 @@ xfs_iformat_local(*/ if (unlikely (size >XFS_DFORK_SIZE (dip, ip->i_mount, whichfork))) {xfs_warn (ip->i_mount, -"corrupt inode %Lu (bad size %d for local fork, size = %d)." , +"corrupt inode %Lu (bad size %d for local fork, size = %zd)." , (unsigned long long ) ip->i_ino, size,XFS_DFORK_SIZE (dip, ip->i_mount, whichfork)); xfs_inode_verifier_error(ip, -EFSCORRUPTED,fs/xfs/libxfs/xfs_inode_fork.h +2
-7@@ -46,14 +46,9 @@ struct xfs_ifork { (ip)->i_afp : \ (ip)->i_cowfp))#define XFS_IFORK_DSIZE (ip) \ - (XFS_IFORK_Q(ip) ? \ - XFS_IFORK_BOFF(ip) : \ - XFS_LITINO((ip)->i_mount, (ip)->i_d.di_version)) + (XFS_IFORK_Q(ip) ? XFS_IFORK_BOFF(ip) : XFS_LITINO((ip)->i_mount))#define XFS_IFORK_ASIZE (ip) \ - (XFS_IFORK_Q(ip) ? \ - XFS_LITINO((ip)->i_mount, (ip)->i_d.di_version) - \ - XFS_IFORK_BOFF(ip) : \ - 0) + (XFS_IFORK_Q(ip) ? XFS_LITINO((ip)->i_mount) - XFS_IFORK_BOFF(ip) : 0)#define XFS_IFORK_SIZE (ip,w) \ ((w) == XFS_DATA_FORK ? \ XFS_IFORK_DSIZE(ip) : \fs/xfs/libxfs/xfs_log_format.h +4
-6@@ -424,12 +424,10 @@ struct xfs_log_dinode {/* structure must be padded to 64 bit alignment */ }; -static inline uint xfs_log_dinode_size (int version) -{ -if (version ==3 ) -return sizeof (struct xfs_log_dinode ); -return offsetof(struct xfs_log_dinode , di_next_unlinked); -} +#define xfs_log_dinode_size (mp) \ + (xfs_sb_version_has_v3inode(&(mp)->m_sb) ? \ + sizeof(struct xfs_log_dinode) : \ + offsetof(struct xfs_log_dinode, di_next_unlinked))/* * Buffer Log Format definitions fs/xfs/xfs_inode_item.c +2
-2@@ -125,7 +125,7 @@ xfs_inode_item_size( *nvecs +=2 ; *nbytes +=sizeof (struct xfs_inode_log_format ) + -xfs_log_dinode_size (ip->i_d.di_version); +xfs_log_dinode_size (ip->i_mount);xfs_inode_item_data_fork_size (iip, nvecs, nbytes);if (XFS_IFORK_Q (ip))@@ -370,7 +370,7 @@ xfs_inode_item_format_core( dic =xlog_prepare_iovec (lv, vecp,XLOG_REG_TYPE_ICORE );xfs_inode_to_log_dinode (ip, dic, ip->i_itemp->ili_item.li_lsn); -xlog_finish_iovec (lv, *vecp,xfs_log_dinode_size (ip->i_d.di_version)); +xlog_finish_iovec (lv, *vecp,xfs_log_dinode_size (ip->i_mount)); }/* fs/xfs/xfs_log_recover.c +1
-1@@ -3068,7 +3068,7 @@ xlog_recover_inode_pass2( error = -EFSCORRUPTED ; goto out_release; } - isize =xfs_log_dinode_size (ldip->di_version); + isize =xfs_log_dinode_size (mp);if (unlikely (item->ri_buf[1 ].i_len > isize)) { XFS_CORRUPTION_ERROR("xlog_recover_inode_pass2(7)", XFS_ERRLEVEL_LOW, mp, ldip,fs/xfs/xfs_symlink.c +1
-1@@ -192,7 +192,7 @@ xfs_symlink(* The symlink will fit into the inode data fork? * There can't be any attributes so we get the whole variable part. */ -if (pathlen <=XFS_LITINO (mp, dp->i_d.di_version)) +if (pathlen <=XFS_LITINO (mp)) fs_blocks =0 ;else fs_blocks =xfs_symlink_blocks (mp, pathlen);Signature · 1 line
2.24.1
PATCH 3/5 xfs: simplify di_flags2 inheritance in xfs_ialloc
In reply to Christoph Hellwigdi_flags2 is initialized to zero for v4 and earlier file systems. This means di_flags2 can only be non-zero for a v5 file systems, in which case both the parent and child inodes can store the field. Remove the extra di_version check, and also remove the rather pointless local di_flags2 variable while at it.
--- fs/xfs/xfs_inode.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
fs/xfs/xfs_inode.c +3 -10
@@ -907,20 +907,13 @@ xfs_ialloc( ip->i_d.di_flags |= di_flags; } -if (pip && - (pip->i_d.di_flags2 &XFS_DIFLAG2_ANY ) && - pip->i_d.di_version ==3 && - ip->i_d.di_version ==3 ) { -uint64_t di_flags2 =0 ; - +if (pip && (pip->i_d.di_flags2 &XFS_DIFLAG2_ANY )) {if (pip->i_d.di_flags2 &XFS_DIFLAG2_COWEXTSIZE ) { - di_flags2 |=XFS_DIFLAG2_COWEXTSIZE ; + ip->i_d.di_flags2 |=XFS_DIFLAG2_COWEXTSIZE ; ip->i_d.di_cowextsize = pip->i_d.di_cowextsize; }if (pip->i_d.di_flags2 &XFS_DIFLAG2_DAX ) - di_flags2 |=XFS_DIFLAG2_DAX ; - - ip->i_d.di_flags2 |= di_flags2; + ip->i_d.di_flags2 |=XFS_DIFLAG2_DAX ; }/* FALLTHROUGH */ case S_IFLNK :
Signature · 1 line
2.24.1
Re: [PATCH 3/5] xfs: simplify di_flags2 inheritance in xfs_ialloc
Quoted 9 lines · Christoph Hellwig
di_flags2is initialized to zero for v4 and earlier file systems. This meansdi_flags2can only be non-zero for a v5 file systems, in which case both the parent and child inodes can store the field. Remove the extradi_versioncheck, and also remove the rather pointless localdi_flags2variable while at it.Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Brian Foster <[email protected]>Reviewed-by Chandan Rajendra <[email protected]>
Looks ok,
--D
Quoted 35 lines
--- fs/xfs/xfs_inode.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)fs/xfs/xfs_inode.c +3
-10@@ -907,20 +907,13 @@ xfs_ialloc( ip->i_d.di_flags |= di_flags; } -if (pip && - (pip->i_d.di_flags2 &XFS_DIFLAG2_ANY ) && - pip->i_d.di_version ==3 && - ip->i_d.di_version ==3 ) { -uint64_t di_flags2 =0 ; - +if (pip && (pip->i_d.di_flags2 &XFS_DIFLAG2_ANY )) {if (pip->i_d.di_flags2 &XFS_DIFLAG2_COWEXTSIZE ) { - di_flags2 |=XFS_DIFLAG2_COWEXTSIZE ; + ip->i_d.di_flags2 |=XFS_DIFLAG2_COWEXTSIZE ; ip->i_d.di_cowextsize = pip->i_d.di_cowextsize; }if (pip->i_d.di_flags2 &XFS_DIFLAG2_DAX ) - di_flags2 |=XFS_DIFLAG2_DAX ; - - ip->i_d.di_flags2 |= di_flags2; + ip->i_d.di_flags2 |=XFS_DIFLAG2_DAX ; }/* FALLTHROUGH */ case S_IFLNK :Signature · 1 line
2.24.1
PATCH 4/5 xfs: simplify a check in xfs_ioctl_setattr_check_cowextsize
In reply to Christoph HellwigOnly v5 file systems can have the reflink feature, and those will always use the large dinode format. Remove the extra check for the inode version.
--- fs/xfs/xfs_ioctl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/xfs/xfs_ioctl.c +1 -2
@@ -1473,8 +1473,7 @@ xfs_ioctl_setattr_check_cowextsize(if (!(fa->fsx_xflags &FS_XFLAG_COWEXTSIZE ))return 0 ; -if (!xfs_sb_version_hasreflink (&ip->i_mount->m_sb) || - ip->i_d.di_version !=3 ) +if (!xfs_sb_version_hasreflink (&ip->i_mount->m_sb))return -EINVAL ;if (fa->fsx_cowextsize ==0 )
Signature · 1 line
2.24.1
Re: [PATCH 4/5] xfs: simplify a check in xfs_ioctl_setattr_check_cowextsize
Quoted 7 lines · Christoph Hellwig
Only v5 file systems can have the reflink feature, and those will always use the large dinode format. Remove the extra check for the inode version.
Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Brian Foster <[email protected]>Reviewed-by Chandan Rajendra <[email protected]>
Looks good,
--D
Quoted 21 lines
--- fs/xfs/xfs_ioctl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)fs/xfs/xfs_ioctl.c +1
-2@@ -1473,8 +1473,7 @@ xfs_ioctl_setattr_check_cowextsize(if (!(fa->fsx_xflags &FS_XFLAG_COWEXTSIZE ))return 0 ; -if (!xfs_sb_version_hasreflink (&ip->i_mount->m_sb) || - ip->i_d.di_version !=3 ) +if (!xfs_sb_version_hasreflink (&ip->i_mount->m_sb))return -EINVAL ;if (fa->fsx_cowextsize ==0 )Signature · 1 line
2.24.1
PATCH 5/5 xfs: remove the di_version field from struct icdinode
In reply to Christoph HellwigWe know the version is 3 if on a v5 file system. For earlier file
systems formats we always upgrade the remaining v1 inodes to v2 and thus only use v2 inodes. Use the xfs_sb_version_has_large_dinode helper to check if we deal with small or large dinodes, and thus remove the need for the di_version field in struct icdinode.
--- fs/xfs/libxfs/xfs_inode_buf.c | 16 ++++++---------- fs/xfs/libxfs/xfs_inode_buf.h | 1 - fs/xfs/xfs_bmap_util.c | 16 ++++++++-------- fs/xfs/xfs_inode.c | 16 ++-------------- fs/xfs/xfs_inode_item.c | 8 +++----- fs/xfs/xfs_ioctl.c | 5 ++--- fs/xfs/xfs_iops.c | 2 +- fs/xfs/xfs_itable.c | 2 +- fs/xfs/xfs_log_recover.c | 2 +- 9 files changed, 24 insertions(+), 44 deletions(-)
fs/xfs/libxfs/xfs_inode_buf.c +6 -10
@@ -194,16 +194,14 @@ xfs_inode_from_disk(struct xfs_icdinode *to = &ip->i_d;struct inode *inode =VFS_I (ip); -/* * Convert v1 inodes immediately to v2 inode format as this is the * minimum inode version format we support in the rest of the code. +* They will also be unconditionally written back to disk as v2 inodes. */ - to->di_version = from->di_version; -if (to->di_version ==1 ) { +if (unlikely (from->di_version ==1 )) {set_nlink (inode,be16_to_cpu (from->di_onlink)); to->di_projid =0 ; - to->di_version =2 ; }else {set_nlink (inode,be32_to_cpu (from->di_nlink)); to->di_projid = (prid_t)be16_to_cpu(from->di_projid_hi) << 16 |
@@ -241,7 +239,7 @@ xfs_inode_from_disk( to->di_dmstate =be16_to_cpu (from->di_dmstate); to->di_flags =be16_to_cpu (from->di_flags); -if (to->di_version ==3 ) { +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.tv_sec =be32_to_cpu (from->di_crtime.t_sec);
@@ -263,7 +261,6 @@ xfs_inode_to_disk( to->di_magic =cpu_to_be16 (XFS_DINODE_MAGIC ); to->di_onlink =0 ; - to->di_version = from->di_version; to->di_format = from->di_format; to->di_uid =cpu_to_be32 (i_uid_read (inode)); to->di_gid =cpu_to_be32 (i_gid_read (inode));
@@ -292,7 +289,8 @@ xfs_inode_to_disk( to->di_dmstate =cpu_to_be16 (from->di_dmstate); to->di_flags =cpu_to_be16 (from->di_flags); -if (from->di_version ==3 ) { +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.t_sec =cpu_to_be32 (from->di_crtime.tv_sec); to->di_crtime.t_nsec =cpu_to_be32 (from->di_crtime.tv_nsec);
@@ -304,6 +302,7 @@ xfs_inode_to_disk(uuid_copy (&to->di_uuid, &ip->i_mount->m_sb.sb_meta_uuid); to->di_flushiter =0 ; }else { + to->di_version =2 ; to->di_flushiter =cpu_to_be16 (from->di_flushiter); } }
@@ -621,7 +620,6 @@ xfs_iread( xfs_sb_version_has_v3inode(&mp->m_sb) && !(mp->m_flags & XFS_MOUNT_IKEEP)) {VFS_I (ip)->i_generation =prandom_u32 (); - ip->i_d.di_version =3 ;return 0 ; }
@@ -663,7 +661,6 @@ xfs_iread(* Partial initialisation of the in-core inode. Just the bits * that xfs_ialloc won't overwrite or relies on being correct. */ - ip->i_d.di_version = dip->di_version;VFS_I (ip)->i_generation =be32_to_cpu (dip->di_gen); ip->i_d.di_flushiter =be16_to_cpu (dip->di_flushiter);
@@ -677,7 +674,6 @@ xfs_iread(VFS_I (ip)->i_mode =0 ; } -ASSERT (ip->i_d.di_version >=2 ); ip->i_delayed_blks =0 ;/*
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 { -int8_t di_version;/* inode version */ int8_t di_format;/* format of di_c data */ uint16_t di_flushiter;/* incremented on flush */ uint32_t di_projid;/* owner's project id */
fs/xfs/xfs_bmap_util.c +8 -8
@@ -1449,12 +1449,12 @@ xfs_swap_extent_forks(* event of a crash. Set the owner change log flags now and leave the * bmbt scan as the last step. */ -if (ip->i_d.di_version ==3 && - ip->i_d.di_format ==XFS_DINODE_FMT_BTREE ) - (*target_log_flags) |=XFS_ILOG_DOWNER ; -if (tip->i_d.di_version ==3 && - tip->i_d.di_format ==XFS_DINODE_FMT_BTREE ) - (*src_log_flags) |=XFS_ILOG_DOWNER ; +if (xfs_sb_version_has_v3inode (&ip->i_mount->m_sb)) { +if (ip->i_d.di_format ==XFS_DINODE_FMT_BTREE ) + (*target_log_flags) |=XFS_ILOG_DOWNER ; +if (tip->i_d.di_format ==XFS_DINODE_FMT_BTREE ) + (*src_log_flags) |=XFS_ILOG_DOWNER ; + }/* * Swap the data forks of the inodes
@@ -1489,7 +1489,7 @@ xfs_swap_extent_forks( (*src_log_flags) |=XFS_ILOG_DEXT ;break ;case XFS_DINODE_FMT_BTREE : -ASSERT (ip->i_d.di_version <3 || +ASSERT (!xfs_sb_version_has_v3inode (&ip->i_mount->m_sb) || (*src_log_flags &XFS_ILOG_DOWNER )); (*src_log_flags) |=XFS_ILOG_DBROOT ;break ;
@@ -1501,7 +1501,7 @@ xfs_swap_extent_forks(break ;case XFS_DINODE_FMT_BTREE : (*target_log_flags) |=XFS_ILOG_DBROOT ; -ASSERT (tip->i_d.di_version <3 || +ASSERT (!xfs_sb_version_has_v3inode (&ip->i_mount->m_sb) || (*target_log_flags &XFS_ILOG_DOWNER ));break ; }
fs/xfs/xfs_inode.c +2 -14
@@ -801,15 +801,6 @@ xfs_ialloc(return error;ASSERT (ip !=NULL ); inode =VFS_I (ip); - -/* -* We always convert v1 inodes to v2 now - we only support filesystems -* with >= v2 inode capability, so there is no reason for ever leaving -* an inode in v1 format. -*/ -if (ip->i_d.di_version ==1 ) - ip->i_d.di_version =2 ; - inode->i_mode = mode;set_nlink (inode, nlink); inode->i_uid =current_fsuid ();
@@ -847,14 +838,13 @@ xfs_ialloc( ip->i_d.di_dmstate =0 ; ip->i_d.di_flags =0 ; -if (ip->i_d.di_version ==3 ) { +if (xfs_sb_version_has_v3inode (&mp->m_sb)) {inode_set_iversion (inode,1 ); ip->i_d.di_flags2 =0 ; ip->i_d.di_cowextsize =0 ; ip->i_d.di_crtime = tv; } - flags =XFS_ILOG_CORE ;switch (mode &S_IFMT ) {case S_IFIFO :
@@ -1115,7 +1105,6 @@ xfs_bumplink( {xfs_trans_ichgtime (tp, ip,XFS_ICHGTIME_CHG ); -ASSERT (ip->i_d.di_version >1 );inc_nlink (VFS_I (ip));xfs_trans_log_inode (tp, ip,XFS_ILOG_CORE ); }
@@ -3798,7 +3787,6 @@ xfs_iflush_int(ASSERT (ip->i_d.di_format !=XFS_DINODE_FMT_BTREE || ip->i_d.di_nextents >XFS_IFORK_MAXEXT (ip,XFS_DATA_FORK ));ASSERT (iip !=NULL && iip->ili_fields !=0 ); -ASSERT (ip->i_d.di_version >1 );/* set *dip = inode's place in the buffer */ dip =xfs_buf_offset (bp, ip->i_imap.im_boffset);
@@ -3859,7 +3847,7 @@ xfs_iflush_int(* backwards compatibility with old kernels that predate logging all * inode changes. */ -if (ip->i_d.di_version <3 ) +if (!xfs_sb_version_has_v3inode (&mp->m_sb)) ip->i_d.di_flushiter++;/* Check the inline fork data before we write out. */
fs/xfs/xfs_inode_item.c +3 -5
@@ -305,8 +305,6 @@ xfs_inode_to_log_dinode(struct inode *inode =VFS_I (ip); to->di_magic =XFS_DINODE_MAGIC ; - - to->di_version = from->di_version; to->di_format = from->di_format; to->di_uid =i_uid_read (inode); to->di_gid =i_gid_read (inode);
@@ -339,7 +337,8 @@ xfs_inode_to_log_dinode(/* log a dummy value to ensure log structure is fully initialised */ to->di_next_unlinked =NULLAGINO ; -if (from->di_version ==3 ) { +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.t_sec = from->di_crtime.tv_sec; to->di_crtime.t_nsec = from->di_crtime.tv_nsec;
@@ -351,6 +350,7 @@ xfs_inode_to_log_dinode(uuid_copy (&to->di_uuid, &ip->i_mount->m_sb.sb_meta_uuid); to->di_flushiter =0 ; }else { + to->di_version =2 ; to->di_flushiter = from->di_flushiter; } }
@@ -395,8 +395,6 @@ xfs_inode_item_format(struct xfs_log_iovec *vecp =NULL ;struct xfs_inode_log_format *ilf; -ASSERT (ip->i_d.di_version >1 ); - ilf =xlog_prepare_iovec (lv, &vecp,XLOG_REG_TYPE_IFORMAT ); ilf->ilf_type =XFS_LI_INODE ; ilf->ilf_ino = ip->i_ino;
fs/xfs/xfs_ioctl.c +2 -3
@@ -1263,7 +1263,7 @@ xfs_ioctl_setattr_xflags(/* diflags2 only valid for v3 inodes. */ di_flags2 =xfs_flags2diflags2 (ip, fa->fsx_xflags); -if (di_flags2 && ip->i_d.di_version <3 ) +if (di_flags2 && !xfs_sb_version_has_v3inode (&mp->m_sb))return -EINVAL ; ip->i_d.di_flags =xfs_flags2diflags (ip, fa->fsx_xflags);
@@ -1601,7 +1601,6 @@ xfs_ioctl_setattr( olddquot =xfs_qm_vop_chown (tp, ip, &ip->i_pdquot, pdqp); } -ASSERT (ip->i_d.di_version >1 ); ip->i_d.di_projid = fa->fsx_projid; }
@@ -1614,7 +1613,7 @@ xfs_ioctl_setattr( ip->i_d.di_extsize = fa->fsx_extsize >> mp->m_sb.sb_blocklog; else ip->i_d.di_extsize = 0; -if (ip->i_d.di_version ==3 && +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;
fs/xfs/xfs_iops.c +1 -1
@@ -557,7 +557,7 @@ xfs_vn_getattr( stat->blocks =XFS_FSB_TO_BB (mp, ip->i_d.di_nblocks + ip->i_delayed_blks); -if (ip->i_d.di_version ==3 ) { +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;
fs/xfs/xfs_itable.c +1 -1
@@ -110,7 +110,7 @@ xfs_bulkstat_one_int( buf->bs_forkoff =XFS_IFORK_BOFF (ip); buf->bs_version =XFS_BULKSTAT_VERSION_V5 ; -if (dic->di_version ==3 ) { +if (xfs_sb_version_has_v3inode (&mp->m_sb)) {if (dic->di_flags2 &XFS_DIFLAG2_COWEXTSIZE ) buf->bs_cowextsize_blks = dic->di_cowextsize; }
fs/xfs/xfs_log_recover.c +1 -1
@@ -2869,8 +2869,8 @@ xfs_recover_inode_owner_change(return -ENOMEM ;/* instantiate the inode */ +ASSERT (dip->di_version >=3 );xfs_inode_from_disk (ip, dip); -ASSERT (ip->i_d.di_version >=3 ); error =xfs_iformat_fork (ip, dip);if (error)
Signature · 1 line
2.24.1
Re: [PATCH 5/5] xfs: remove the di_version field from struct icdinode
Quoted 9 lines · Christoph Hellwig
We know the version is 3 if on a v5 file system. For earlier file
systems formats we always upgrade the remaining v1 inodes to v2 and thus only use v2 inodes. Use thexfs_sb_version_has_large_dinodehelper to check if we deal with small or large dinodes, and thus remove the need for thedi_versionfield in struct icdinode.Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Brian Foster <[email protected]>Reviewed-by Chandan Rajendra <[email protected]>
Looks ok,
--D
Quoted 321 lines
--- fs/xfs/libxfs/xfs_inode_buf.c | 16 ++++++---------- fs/xfs/libxfs/xfs_inode_buf.h | 1 - fs/xfs/xfs_bmap_util.c | 16 ++++++++-------- fs/xfs/xfs_inode.c | 16 ++-------------- fs/xfs/xfs_inode_item.c | 8 +++----- fs/xfs/xfs_ioctl.c | 5 ++--- fs/xfs/xfs_iops.c | 2 +- fs/xfs/xfs_itable.c | 2 +- fs/xfs/xfs_log_recover.c | 2 +- 9 files changed, 24 insertions(+), 44 deletions(-)fs/xfs/libxfs/xfs_inode_buf.c +6
-10@@ -194,16 +194,14 @@ xfs_inode_from_disk(struct xfs_icdinode *to = &ip->i_d;struct inode *inode =VFS_I (ip); -/* * Convert v1 inodes immediately to v2 inode format as this is the * minimum inode version format we support in the rest of the code. +* They will also be unconditionally written back to disk as v2 inodes. */ - to->di_version = from->di_version; -if (to->di_version ==1 ) { +if (unlikely (from->di_version ==1 )) {set_nlink (inode,be16_to_cpu (from->di_onlink)); to->di_projid =0 ; - to->di_version =2 ; }else {set_nlink (inode,be32_to_cpu (from->di_nlink)); to->di_projid = (prid_t)be16_to_cpu(from->di_projid_hi) << 16 |@@ -241,7 +239,7 @@ xfs_inode_from_disk( to->di_dmstate =be16_to_cpu (from->di_dmstate); to->di_flags =be16_to_cpu (from->di_flags); -if (to->di_version ==3 ) { +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.tv_sec =be32_to_cpu (from->di_crtime.t_sec);@@ -263,7 +261,6 @@ xfs_inode_to_disk( to->di_magic =cpu_to_be16 (XFS_DINODE_MAGIC ); to->di_onlink =0 ; - to->di_version = from->di_version; to->di_format = from->di_format; to->di_uid =cpu_to_be32 (i_uid_read (inode)); to->di_gid =cpu_to_be32 (i_gid_read (inode));@@ -292,7 +289,8 @@ xfs_inode_to_disk( to->di_dmstate =cpu_to_be16 (from->di_dmstate); to->di_flags =cpu_to_be16 (from->di_flags); -if (from->di_version ==3 ) { +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.t_sec =cpu_to_be32 (from->di_crtime.tv_sec); to->di_crtime.t_nsec =cpu_to_be32 (from->di_crtime.tv_nsec);@@ -304,6 +302,7 @@ xfs_inode_to_disk(uuid_copy (&to->di_uuid, &ip->i_mount->m_sb.sb_meta_uuid); to->di_flushiter =0 ; }else { + to->di_version =2 ; to->di_flushiter =cpu_to_be16 (from->di_flushiter); } }@@ -621,7 +620,6 @@ xfs_iread( xfs_sb_version_has_v3inode(&mp->m_sb) && !(mp->m_flags & XFS_MOUNT_IKEEP)) {VFS_I (ip)->i_generation =prandom_u32 (); - ip->i_d.di_version =3 ;return 0 ; }@@ -663,7 +661,6 @@ xfs_iread(* Partial initialisation of the in-core inode. Just the bits * that xfs_ialloc won't overwrite or relies on being correct. */ - ip->i_d.di_version = dip->di_version;VFS_I (ip)->i_generation =be32_to_cpu (dip->di_gen); ip->i_d.di_flushiter =be16_to_cpu (dip->di_flushiter);@@ -677,7 +674,6 @@ xfs_iread(VFS_I (ip)->i_mode =0 ; } -ASSERT (ip->i_d.di_version >=2 ); ip->i_delayed_blks =0 ;/* 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 { -int8_t di_version;/* inode version */ int8_t di_format;/* format of di_c data */ uint16_t di_flushiter;/* incremented on flush */ uint32_t di_projid;/* owner's project id */ fs/xfs/xfs_bmap_util.c +8
-8@@ -1449,12 +1449,12 @@ xfs_swap_extent_forks(* event of a crash. Set the owner change log flags now and leave the * bmbt scan as the last step. */ -if (ip->i_d.di_version ==3 && - ip->i_d.di_format ==XFS_DINODE_FMT_BTREE ) - (*target_log_flags) |=XFS_ILOG_DOWNER ; -if (tip->i_d.di_version ==3 && - tip->i_d.di_format ==XFS_DINODE_FMT_BTREE ) - (*src_log_flags) |=XFS_ILOG_DOWNER ; +if (xfs_sb_version_has_v3inode (&ip->i_mount->m_sb)) { +if (ip->i_d.di_format ==XFS_DINODE_FMT_BTREE ) + (*target_log_flags) |=XFS_ILOG_DOWNER ; +if (tip->i_d.di_format ==XFS_DINODE_FMT_BTREE ) + (*src_log_flags) |=XFS_ILOG_DOWNER ; + }/* * Swap the data forks of the inodes @@ -1489,7 +1489,7 @@ xfs_swap_extent_forks( (*src_log_flags) |=XFS_ILOG_DEXT ;break ;case XFS_DINODE_FMT_BTREE : -ASSERT (ip->i_d.di_version <3 || +ASSERT (!xfs_sb_version_has_v3inode (&ip->i_mount->m_sb) || (*src_log_flags &XFS_ILOG_DOWNER )); (*src_log_flags) |=XFS_ILOG_DBROOT ;break ;@@ -1501,7 +1501,7 @@ xfs_swap_extent_forks(break ;case XFS_DINODE_FMT_BTREE : (*target_log_flags) |=XFS_ILOG_DBROOT ; -ASSERT (tip->i_d.di_version <3 || +ASSERT (!xfs_sb_version_has_v3inode (&ip->i_mount->m_sb) || (*target_log_flags &XFS_ILOG_DOWNER ));break ; }fs/xfs/xfs_inode.c +2
-14@@ -801,15 +801,6 @@ xfs_ialloc(return error;ASSERT (ip !=NULL ); inode =VFS_I (ip); - -/* -* We always convert v1 inodes to v2 now - we only support filesystems -* with >= v2 inode capability, so there is no reason for ever leaving -* an inode in v1 format. -*/ -if (ip->i_d.di_version ==1 ) - ip->i_d.di_version =2 ; - inode->i_mode = mode;set_nlink (inode, nlink); inode->i_uid =current_fsuid ();@@ -847,14 +838,13 @@ xfs_ialloc( ip->i_d.di_dmstate =0 ; ip->i_d.di_flags =0 ; -if (ip->i_d.di_version ==3 ) { +if (xfs_sb_version_has_v3inode (&mp->m_sb)) {inode_set_iversion (inode,1 ); ip->i_d.di_flags2 =0 ; ip->i_d.di_cowextsize =0 ; ip->i_d.di_crtime = tv; } - flags =XFS_ILOG_CORE ;switch (mode &S_IFMT ) {case S_IFIFO :@@ -1115,7 +1105,6 @@ xfs_bumplink( {xfs_trans_ichgtime (tp, ip,XFS_ICHGTIME_CHG ); -ASSERT (ip->i_d.di_version >1 );inc_nlink (VFS_I (ip));xfs_trans_log_inode (tp, ip,XFS_ILOG_CORE ); }@@ -3798,7 +3787,6 @@ xfs_iflush_int(ASSERT (ip->i_d.di_format !=XFS_DINODE_FMT_BTREE || ip->i_d.di_nextents >XFS_IFORK_MAXEXT (ip,XFS_DATA_FORK ));ASSERT (iip !=NULL && iip->ili_fields !=0 ); -ASSERT (ip->i_d.di_version >1 );/* set *dip = inode's place in the buffer */ dip =xfs_buf_offset (bp, ip->i_imap.im_boffset);@@ -3859,7 +3847,7 @@ xfs_iflush_int(* backwards compatibility with old kernels that predate logging all * inode changes. */ -if (ip->i_d.di_version <3 ) +if (!xfs_sb_version_has_v3inode (&mp->m_sb)) ip->i_d.di_flushiter++;/* Check the inline fork data before we write out. */ fs/xfs/xfs_inode_item.c +3
-5@@ -305,8 +305,6 @@ xfs_inode_to_log_dinode(struct inode *inode =VFS_I (ip); to->di_magic =XFS_DINODE_MAGIC ; - - to->di_version = from->di_version; to->di_format = from->di_format; to->di_uid =i_uid_read (inode); to->di_gid =i_gid_read (inode);@@ -339,7 +337,8 @@ xfs_inode_to_log_dinode(/* log a dummy value to ensure log structure is fully initialised */ to->di_next_unlinked =NULLAGINO ; -if (from->di_version ==3 ) { +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.t_sec = from->di_crtime.tv_sec; to->di_crtime.t_nsec = from->di_crtime.tv_nsec;@@ -351,6 +350,7 @@ xfs_inode_to_log_dinode(uuid_copy (&to->di_uuid, &ip->i_mount->m_sb.sb_meta_uuid); to->di_flushiter =0 ; }else { + to->di_version =2 ; to->di_flushiter = from->di_flushiter; } }@@ -395,8 +395,6 @@ xfs_inode_item_format(struct xfs_log_iovec *vecp =NULL ;struct xfs_inode_log_format *ilf; -ASSERT (ip->i_d.di_version >1 ); - ilf =xlog_prepare_iovec (lv, &vecp,XLOG_REG_TYPE_IFORMAT ); ilf->ilf_type =XFS_LI_INODE ; ilf->ilf_ino = ip->i_ino;fs/xfs/xfs_ioctl.c +2
-3@@ -1263,7 +1263,7 @@ xfs_ioctl_setattr_xflags(/* diflags2 only valid for v3 inodes. */ di_flags2 =xfs_flags2diflags2 (ip, fa->fsx_xflags); -if (di_flags2 && ip->i_d.di_version <3 ) +if (di_flags2 && !xfs_sb_version_has_v3inode (&mp->m_sb))return -EINVAL ; ip->i_d.di_flags =xfs_flags2diflags (ip, fa->fsx_xflags);@@ -1601,7 +1601,6 @@ xfs_ioctl_setattr( olddquot =xfs_qm_vop_chown (tp, ip, &ip->i_pdquot, pdqp); } -ASSERT (ip->i_d.di_version >1 ); ip->i_d.di_projid = fa->fsx_projid; }@@ -1614,7 +1613,7 @@ xfs_ioctl_setattr( ip->i_d.di_extsize = fa->fsx_extsize >> mp->m_sb.sb_blocklog; else ip->i_d.di_extsize = 0; -if (ip->i_d.di_version ==3 && +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;fs/xfs/xfs_iops.c +1
-1@@ -557,7 +557,7 @@ xfs_vn_getattr( stat->blocks =XFS_FSB_TO_BB (mp, ip->i_d.di_nblocks + ip->i_delayed_blks); -if (ip->i_d.di_version ==3 ) { +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;fs/xfs/xfs_itable.c +1
-1@@ -110,7 +110,7 @@ xfs_bulkstat_one_int( buf->bs_forkoff =XFS_IFORK_BOFF (ip); buf->bs_version =XFS_BULKSTAT_VERSION_V5 ; -if (dic->di_version ==3 ) { +if (xfs_sb_version_has_v3inode (&mp->m_sb)) {if (dic->di_flags2 &XFS_DIFLAG2_COWEXTSIZE ) buf->bs_cowextsize_blks = dic->di_cowextsize; }fs/xfs/xfs_log_recover.c +1
-1@@ -2869,8 +2869,8 @@ xfs_recover_inode_owner_change(return -ENOMEM ;/* instantiate the inode */ +ASSERT (dip->di_version >=3 );xfs_inode_from_disk (ip, dip); -ASSERT (ip->i_d.di_version >=3 ); error =xfs_iformat_fork (ip, dip);if (error)Signature · 1 line
2.24.1