Commit 3ba738df authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: remove the xfs_ifork_t typedef 



We only have a few more callers left, so seize the opportunity and kill
it off.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 1216b58b

fs/xfs/libxfs/xfs_attr_leaf.c

+3 −3
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ xfs_attr_shortform_create(xfs_da_args_t *args) 
{

	xfs_attr_sf_hdr_t *hdr;

	xfs_inode_t *dp;

	xfs_ifork_t *ifp;

	struct xfs_ifork *ifp;



	trace_xfs_attr_sf_create(args);
@@ -563,7 +563,7 @@ xfs_attr_shortform_add(xfs_da_args_t *args, int forkoff) 
	int i, offset, size;

	xfs_mount_t *mp;

	xfs_inode_t *dp;

	xfs_ifork_t *ifp;

	struct xfs_ifork *ifp;



	trace_xfs_attr_sf_add(args);
@@ -704,7 +704,7 @@ xfs_attr_shortform_lookup(xfs_da_args_t *args) 
	xfs_attr_shortform_t *sf;

	xfs_attr_sf_entry_t *sfe;

	int i;

	xfs_ifork_t *ifp;

	struct xfs_ifork *ifp;



	trace_xfs_attr_sf_lookup(args);

fs/xfs/libxfs/xfs_bmap.c

+9 −9
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ xfs_bmap_check_leaf_extents( 
	xfs_buf_t		*bp;	/* buffer for "block" */

	int			error;	/* error return value */

	xfs_extnum_t		i=0, j;	/* index into the extents list */

	xfs_ifork_t		*ifp;	/* fork structure */

	struct xfs_ifork	*ifp;	/* fork structure */

	int			level;	/* btree level, for checking */

	xfs_mount_t		*mp;	/* file system mount structure */

	__be64			*pp;	/* pointer to block address */
@@ -594,7 +594,7 @@ xfs_bmap_btree_to_extents( 
	xfs_fsblock_t		cbno;	/* child block number */

	xfs_buf_t		*cbp;	/* child block's buffer */

	int			error;	/* error return value */

	xfs_ifork_t		*ifp;	/* inode fork data */

	struct xfs_ifork	*ifp;	/* inode fork data */

	xfs_mount_t		*mp;	/* mount point structure */

	__be64			*pp;	/* ptr to block address */

	struct xfs_btree_block	*rblock;/* root btree block */
@@ -817,7 +817,7 @@ xfs_bmap_local_to_extents( 
{

	int		error = 0;

	int		flags;		/* logging flags returned */

	xfs_ifork_t	*ifp;		/* inode fork pointer */

	struct xfs_ifork *ifp;		/* inode fork pointer */

	xfs_alloc_arg_t	args;		/* allocation arguments */

	xfs_buf_t	*bp;		/* buffer for extent block */

	struct xfs_bmbt_irec rec;
@@ -1471,7 +1471,7 @@ xfs_bmap_one_block( 
	xfs_inode_t	*ip,		/* incore inode */

	int		whichfork)	/* data or attr fork */

{

	xfs_ifork_t	*ifp;		/* inode fork pointer */

	struct xfs_ifork *ifp;		/* inode fork pointer */

	int		rval;		/* return value */

	xfs_bmbt_irec_t	s;		/* internal version of extent */

	struct xfs_iext_cursor icur;
@@ -1509,7 +1509,7 @@ xfs_bmap_add_extent_delay_real( 
	struct xfs_bmbt_irec	*new = &bma->got;

	int			error;	/* error return value */

	int			i;	/* temp state */

	xfs_ifork_t		*ifp;	/* inode fork pointer */

	struct xfs_ifork	*ifp;	/* inode fork pointer */

	xfs_fileoff_t		new_endoff;	/* end offset of new entry */

	xfs_bmbt_irec_t		r[3];	/* neighbor extent entries */

					/* left is 0, right is 1, prev is 2 */
@@ -2018,7 +2018,7 @@ xfs_bmap_add_extent_unwritten_real( 
	xfs_btree_cur_t		*cur;	/* btree cursor */

	int			error;	/* error return value */

	int			i;	/* temp state */

	xfs_ifork_t		*ifp;	/* inode fork pointer */

	struct xfs_ifork	*ifp;	/* inode fork pointer */

	xfs_fileoff_t		new_endoff;	/* end offset of new entry */

	xfs_bmbt_irec_t		r[3];	/* neighbor extent entries */

					/* left is 0, right is 1, prev is 2 */
@@ -2486,7 +2486,7 @@ xfs_bmap_add_extent_hole_delay( 
	struct xfs_iext_cursor	*icur,

	xfs_bmbt_irec_t		*new)	/* new data to add to file extents */

{

	xfs_ifork_t		*ifp;	/* inode fork pointer */

	struct xfs_ifork	*ifp;	/* inode fork pointer */

	xfs_bmbt_irec_t		left;	/* left neighbor extent entry */

	xfs_filblks_t		newlen=0;	/* new indirect size */

	xfs_filblks_t		oldlen=0;	/* old indirect size */
@@ -4844,7 +4844,7 @@ xfs_bmap_del_extent_real( 
	struct xfs_bmbt_irec	got;	/* current extent entry */

	xfs_fileoff_t		got_endoff;	/* first offset past got */

	int			i;	/* temp state */

	xfs_ifork_t		*ifp;	/* inode fork pointer */

	struct xfs_ifork	*ifp;	/* inode fork pointer */

	xfs_mount_t		*mp;	/* mount structure */

	xfs_filblks_t		nblks;	/* quota/sb block count */

	xfs_bmbt_irec_t		new;	/* new record to be inserted */
@@ -5092,7 +5092,7 @@ __xfs_bunmapi( 
	int			error;		/* error return value */

	xfs_extnum_t		extno;		/* extent number in list */

	struct xfs_bmbt_irec	got;		/* current extent record */

	xfs_ifork_t		*ifp;		/* inode fork pointer */

	struct xfs_ifork	*ifp;		/* inode fork pointer */

	int			isrt;		/* freeing in rt area */

	int			logflags;	/* transaction logging flags */

	xfs_extlen_t		mod;		/* rt extent offset */

fs/xfs/libxfs/xfs_inode_fork.c

+4 −4
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ xfs_iformat_btree( 
{

	struct xfs_mount	*mp = ip->i_mount;

	xfs_bmdr_block_t	*dfp;

	xfs_ifork_t		*ifp;

	struct xfs_ifork	*ifp;

	/* REFERENCED */

	int			nrecs;

	int			size;
@@ -347,7 +347,7 @@ xfs_iroot_realloc( 
{

	struct xfs_mount	*mp = ip->i_mount;

	int			cur_max;

	xfs_ifork_t		*ifp;

	struct xfs_ifork	*ifp;

	struct xfs_btree_block	*new_broot;

	int			new_max;

	size_t			new_size;
@@ -503,7 +503,7 @@ xfs_idestroy_fork( 
	xfs_inode_t	*ip,

	int		whichfork)

{

	xfs_ifork_t	*ifp;

	struct xfs_ifork	*ifp;



	ifp = XFS_IFORK_PTR(ip, whichfork);

	if (ifp->if_broot != NULL) {
@@ -592,7 +592,7 @@ xfs_iflush_fork( 
	int			whichfork)

{

	char			*cp;

	xfs_ifork_t		*ifp;

	struct xfs_ifork	*ifp;

	xfs_mount_t		*mp;

	static const short	brootflag[2] =

		{ XFS_ILOG_DBROOT, XFS_ILOG_ABROOT };

fs/xfs/libxfs/xfs_inode_fork.h

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ struct xfs_dinode; 
/*

 * File incore extent information, present for each of data & attr forks.

 */

typedef struct xfs_ifork {

struct xfs_ifork {

	int			if_bytes;	/* bytes in if_u1 */

	struct xfs_btree_block	*if_broot;	/* file's incore btree root */

	short			if_broot_bytes;	/* bytes allocated for root */
@@ -22,7 +22,7 @@ typedef struct xfs_ifork { 
		void		*if_root;	/* extent tree root */

		char		*if_data;	/* inline file data */

	} if_u1;

} xfs_ifork_t;

};



/*

 * Per-fork incore inode flags.

fs/xfs/xfs_icache.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ xfs_inode_alloc( 
	ip->i_cowfp = NULL;

	ip->i_cnextents = 0;

	ip->i_cformat = XFS_DINODE_FMT_EXTENTS;

	memset(&ip->i_df, 0, sizeof(xfs_ifork_t));

	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));