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

Commit 3de559fb authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Dave Chinner
Browse files

xfs: refactor xfs_inode_item_format 



Split out a function to handle the data and attr fork, as well as a
helper for the really old v1 inodes.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent ce9641d6

fs/xfs/xfs_inode_item.c

+89 −76
Original line number Diff line number Diff line
@@ -180,47 +180,16 @@ xfs_inode_item_format_extents( 
}



/*

 * This is called to fill in the vector of log iovecs for the

 * given inode log item.  It fills the first item with an inode

 * log format structure, the second with the on-disk inode structure,

 * and a possible third and/or fourth with the inode data/extents/b-tree

 * root and inode attributes data/extents/b-tree root.

 * If this is a v1 format inode, then we need to log it as such.  This means

 * that we have to copy the link count from the new field to the old.  We

 * don't have to worry about the new fields, because nothing trusts them as

 * long as the old inode version number is there.

 */

STATIC void

xfs_inode_item_format(

	struct xfs_log_item	*lip,

	struct xfs_log_iovec	*vecp)

xfs_inode_item_format_v1_inode(

	struct xfs_inode	*ip)

{

	struct xfs_inode_log_item *iip = INODE_ITEM(lip);

	struct xfs_inode	*ip = iip->ili_inode;

	uint			nvecs;

	size_t			data_bytes;

	xfs_mount_t		*mp;



	vecp->i_addr = &iip->ili_format;

	vecp->i_len  = sizeof(xfs_inode_log_format_t);

	vecp->i_type = XLOG_REG_TYPE_IFORMAT;

	vecp++;

	nvecs	     = 1;



	vecp->i_addr = &ip->i_d;

	vecp->i_len  = xfs_icdinode_size(ip->i_d.di_version);

	vecp->i_type = XLOG_REG_TYPE_ICORE;

	vecp++;

	nvecs++;



	/*

	 * If this is really an old format inode, then we need to

	 * log it as such.  This means that we have to copy the link

	 * count from the new field to the old.  We don't have to worry

	 * about the new fields, because nothing trusts them as long as

	 * the old inode version number is there.  If the superblock already

	 * has a new version number, then we don't bother converting back.

	 */

	mp = ip->i_mount;

	ASSERT(ip->i_d.di_version == 1 || xfs_sb_version_hasnlink(&mp->m_sb));

	if (ip->i_d.di_version == 1) {

		if (!xfs_sb_version_hasnlink(&mp->m_sb)) {

	if (!xfs_sb_version_hasnlink(&ip->i_mount->m_sb)) {

		/*

		 * Convert it back.

		 */
@@ -238,6 +207,15 @@ xfs_inode_item_format( 
	}

}



STATIC struct xfs_log_iovec *

xfs_inode_item_format_data_fork(

	struct xfs_inode_log_item *iip,

	struct xfs_log_iovec	*vecp,

	int			*nvecs)

{

	struct xfs_inode	*ip = iip->ili_inode;

	size_t			data_bytes;



	switch (ip->i_d.di_format) {

	case XFS_DINODE_FMT_EXTENTS:

		iip->ili_fields &=
@@ -271,12 +249,11 @@ xfs_inode_item_format( 
			ASSERT(vecp->i_len <= ip->i_df.if_bytes);

			iip->ili_format.ilf_dsize = vecp->i_len;

			vecp++;

			nvecs++;

			(*nvecs)++;

		} else {

			iip->ili_fields &= ~XFS_ILOG_DEXT;

		}

		break;



	case XFS_DINODE_FMT_BTREE:

		iip->ili_fields &=

			~(XFS_ILOG_DDATA | XFS_ILOG_DEXT |
@@ -289,7 +266,7 @@ xfs_inode_item_format( 
			vecp->i_len = ip->i_df.if_broot_bytes;

			vecp->i_type = XLOG_REG_TYPE_IBROOT;

			vecp++;

			nvecs++;

			(*nvecs)++;

			iip->ili_format.ilf_dsize = ip->i_df.if_broot_bytes;

		} else {

			ASSERT(!(iip->ili_fields &
@@ -297,7 +274,6 @@ xfs_inode_item_format( 
			iip->ili_fields &= ~XFS_ILOG_DBROOT;

		}

		break;



	case XFS_DINODE_FMT_LOCAL:

		iip->ili_fields &=

			~(XFS_ILOG_DEXT | XFS_ILOG_DBROOT |
@@ -319,13 +295,12 @@ xfs_inode_item_format( 
			vecp->i_len = (int)data_bytes;

			vecp->i_type = XLOG_REG_TYPE_ILOCAL;

			vecp++;

			nvecs++;

			(*nvecs)++;

			iip->ili_format.ilf_dsize = (unsigned)data_bytes;

		} else {

			iip->ili_fields &= ~XFS_ILOG_DDATA;

		}

		break;



	case XFS_DINODE_FMT_DEV:

		iip->ili_fields &=

			~(XFS_ILOG_DDATA | XFS_ILOG_DBROOT |
@@ -335,7 +310,6 @@ xfs_inode_item_format( 
				ip->i_df.if_u2.if_rdev;

		}

		break;



	case XFS_DINODE_FMT_UUID:

		iip->ili_fields &=

			~(XFS_ILOG_DDATA | XFS_ILOG_DBROOT |
@@ -345,21 +319,23 @@ xfs_inode_item_format( 
				ip->i_df.if_u2.if_uuid;

		}

		break;



	default:

		ASSERT(0);

		break;

	}



	/*

	 * If there are no attributes associated with the file, then we're done.

	 */

	if (!XFS_IFORK_Q(ip)) {

		iip->ili_fields &=

			~(XFS_ILOG_ADATA | XFS_ILOG_ABROOT | XFS_ILOG_AEXT);

		goto out;

	return vecp;

}



STATIC struct xfs_log_iovec *

xfs_inode_item_format_attr_fork(

	struct xfs_inode_log_item *iip,

	struct xfs_log_iovec	*vecp,

	int			*nvecs)

{

	struct xfs_inode	*ip = iip->ili_inode;

	size_t			data_bytes;



	switch (ip->i_d.di_aformat) {

	case XFS_DINODE_FMT_EXTENTS:

		iip->ili_fields &=
@@ -386,12 +362,11 @@ xfs_inode_item_format( 
#endif

			iip->ili_format.ilf_asize = vecp->i_len;

			vecp++;

			nvecs++;

			(*nvecs)++;

		} else {

			iip->ili_fields &= ~XFS_ILOG_AEXT;

		}

		break;



	case XFS_DINODE_FMT_BTREE:

		iip->ili_fields &=

			~(XFS_ILOG_ADATA | XFS_ILOG_AEXT);
@@ -404,13 +379,12 @@ xfs_inode_item_format( 
			vecp->i_len = ip->i_afp->if_broot_bytes;

			vecp->i_type = XLOG_REG_TYPE_IATTR_BROOT;

			vecp++;

			nvecs++;

			(*nvecs)++;

			iip->ili_format.ilf_asize = ip->i_afp->if_broot_bytes;

		} else {

			iip->ili_fields &= ~XFS_ILOG_ABROOT;

		}

		break;



	case XFS_DINODE_FMT_LOCAL:

		iip->ili_fields &=

			~(XFS_ILOG_AEXT | XFS_ILOG_ABROOT);
@@ -431,19 +405,59 @@ xfs_inode_item_format( 
			vecp->i_len = (int)data_bytes;

			vecp->i_type = XLOG_REG_TYPE_IATTR_LOCAL;

			vecp++;

			nvecs++;

			(*nvecs)++;

			iip->ili_format.ilf_asize = (unsigned)data_bytes;

		} else {

			iip->ili_fields &= ~XFS_ILOG_ADATA;

		}

		break;



	default:

		ASSERT(0);

		break;

	}



out:

	return vecp;

}



/*

 * This is called to fill in the vector of log iovecs for the given inode

 * log item.  It fills the first item with an inode log format structure,

 * the second with the on-disk inode structure, and a possible third and/or

 * fourth with the inode data/extents/b-tree root and inode attributes

 * data/extents/b-tree root.

 */

STATIC void

xfs_inode_item_format(

	struct xfs_log_item	*lip,

	struct xfs_log_iovec	*vecp)

{

	struct xfs_inode_log_item *iip = INODE_ITEM(lip);

	struct xfs_inode	*ip = iip->ili_inode;

	uint			nvecs;



	vecp->i_addr = &iip->ili_format;

	vecp->i_len  = sizeof(xfs_inode_log_format_t);

	vecp->i_type = XLOG_REG_TYPE_IFORMAT;

	vecp++;

	nvecs	     = 1;



	vecp->i_addr = &ip->i_d;

	vecp->i_len  = xfs_icdinode_size(ip->i_d.di_version);

	vecp->i_type = XLOG_REG_TYPE_ICORE;

	vecp++;

	nvecs++;



	if (ip->i_d.di_version == 1)

		xfs_inode_item_format_v1_inode(ip);



	vecp = xfs_inode_item_format_data_fork(iip, vecp, &nvecs);

	if (XFS_IFORK_Q(ip)) {

		vecp = xfs_inode_item_format_attr_fork(iip, vecp, &nvecs);

	} else {

		iip->ili_fields &=

			~(XFS_ILOG_ADATA | XFS_ILOG_ABROOT | XFS_ILOG_AEXT);

	}



	/*

	 * Now update the log format that goes out to disk from the in-core

	 * values.  We always write the inode core to make the arithmetic
@@ -455,7 +469,6 @@ xfs_inode_item_format( 
	iip->ili_format.ilf_size = nvecs;

}





/*

 * This is called to pin the inode associated with the inode log

 * item in memory so it cannot be written out.