Commit 21e308e6 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: remove the xfs_buftarg_t typedef 



Switch the few remaining holdouts to the struct version.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent 24f755e4

fs/xfs/xfs_buf.c

+3 −3
Original line number Diff line number Diff line
@@ -1980,7 +1980,7 @@ xfs_free_buftarg( 


int

xfs_setsize_buftarg(

	xfs_buftarg_t		*btp,

	struct xfs_buftarg	*btp,

	unsigned int		sectorsize)

{

	/* Set up metadata sector size info */
@@ -2008,7 +2008,7 @@ xfs_setsize_buftarg( 
 */

STATIC int

xfs_setsize_buftarg_early(

	xfs_buftarg_t		*btp)

	struct xfs_buftarg	*btp)

{

	return xfs_setsize_buftarg(btp, bdev_logical_block_size(btp->bt_bdev));

}
@@ -2018,7 +2018,7 @@ xfs_alloc_buftarg( 
	struct xfs_mount	*mp,

	struct bdev_handle	*bdev_handle)

{

	xfs_buftarg_t		*btp;

	struct xfs_buftarg	*btp;

	const struct dax_holder_operations *ops = NULL;



#if defined(CONFIG_FS_DAX) && defined(CONFIG_MEMORY_FAILURE)

fs/xfs/xfs_buf.h

+2 −2
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ typedef unsigned int xfs_buf_flags_t; 
 * The latter is derived from the underlying device, and controls direct IO

 * alignment constraints.

 */

typedef struct xfs_buftarg {

struct xfs_buftarg {

	dev_t			bt_dev;

	struct bdev_handle	*bt_bdev_handle;

	struct block_device	*bt_bdev;
@@ -114,7 +114,7 @@ typedef struct xfs_buftarg { 


	struct percpu_counter	bt_io_count;

	struct ratelimit_state	bt_ioerror_rl;

} xfs_buftarg_t;

};



#define XB_PAGES	2

fs/xfs/xfs_log.c

+8 −8
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ xlog_state_release_iclog( 
int

xfs_log_mount(

	xfs_mount_t		*mp,

	xfs_buftarg_t	*log_target,

	struct xfs_buftarg	*log_target,

	xfs_daddr_t		blk_offset,

	int			num_bblks)

{

fs/xfs/xfs_mount.h

+3 −3
Original line number Diff line number Diff line
@@ -94,9 +94,9 @@ typedef struct xfs_mount { 
	struct xfs_inode	*m_rsumip;	/* pointer to summary inode */

	struct xfs_inode	*m_rootip;	/* pointer to root directory */

	struct xfs_quotainfo	*m_quotainfo;	/* disk quota information */

	xfs_buftarg_t		*m_ddev_targp;	/* saves taking the address */

	xfs_buftarg_t		*m_logdev_targp;/* ptr to log device */

	xfs_buftarg_t		*m_rtdev_targp;	/* ptr to rt device */

	struct xfs_buftarg	*m_ddev_targp;	/* data device */

	struct xfs_buftarg	*m_logdev_targp;/* log device */

	struct xfs_buftarg	*m_rtdev_targp;	/* rt device */

	void __percpu		*m_inodegc;	/* percpu inodegc structures */



	/*