Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90aab52d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Greg Kroah-Hartman
Browse files

xfs: add a new xfs_sb_version_has_v3inode helper 



commit b81b79f4eda2ea98ae5695c0b6eb384c8d90b74d upstream.

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.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarChandan Rajendra <chandanrlinux@gmail.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarChandan Babu R <chandan.babu@oracle.com>
Acked-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent edd36a57

fs/xfs/libxfs/xfs_format.h

+17 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -303,7 +303,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));
@@ -2818,7 +2818,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
Original line number Diff line number Diff line
@@ -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)) {

		/* initialise the on-disk inode core */

		memset(&ip->i_d, 0, sizeof(ip->i_d));

fs/xfs/libxfs/xfs_inode_buf.h

+0 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);

	}