Skip to content

Commit 21e308e

Browse files
Christoph HellwigDarrick J. Wong
authored andcommitted
xfs: remove the xfs_buftarg_t typedef
Switch the few remaining holdouts to the struct version. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Darrick J. Wong <djwong@kernel.org> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
1 parent 24f755e commit 21e308e

4 files changed

Lines changed: 16 additions & 16 deletions

File tree

fs/xfs/xfs_buf.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1980,7 +1980,7 @@ xfs_free_buftarg(
19801980

19811981
int
19821982
xfs_setsize_buftarg(
1983-
xfs_buftarg_t *btp,
1983+
struct xfs_buftarg *btp,
19841984
unsigned int sectorsize)
19851985
{
19861986
/* Set up metadata sector size info */
@@ -2008,7 +2008,7 @@ xfs_setsize_buftarg(
20082008
*/
20092009
STATIC int
20102010
xfs_setsize_buftarg_early(
2011-
xfs_buftarg_t *btp)
2011+
struct xfs_buftarg *btp)
20122012
{
20132013
return xfs_setsize_buftarg(btp, bdev_logical_block_size(btp->bt_bdev));
20142014
}
@@ -2018,7 +2018,7 @@ xfs_alloc_buftarg(
20182018
struct xfs_mount *mp,
20192019
struct bdev_handle *bdev_handle)
20202020
{
2021-
xfs_buftarg_t *btp;
2021+
struct xfs_buftarg *btp;
20222022
const struct dax_holder_operations *ops = NULL;
20232023

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

fs/xfs/xfs_buf.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ typedef unsigned int xfs_buf_flags_t;
9696
* The latter is derived from the underlying device, and controls direct IO
9797
* alignment constraints.
9898
*/
99-
typedef struct xfs_buftarg {
99+
struct xfs_buftarg {
100100
dev_t bt_dev;
101101
struct bdev_handle *bt_bdev_handle;
102102
struct block_device *bt_bdev;
@@ -114,7 +114,7 @@ typedef struct xfs_buftarg {
114114

115115
struct percpu_counter bt_io_count;
116116
struct ratelimit_state bt_ioerror_rl;
117-
} xfs_buftarg_t;
117+
};
118118

119119
#define XB_PAGES 2
120120

fs/xfs/xfs_log.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -633,14 +633,14 @@ xlog_state_release_iclog(
633633
*/
634634
int
635635
xfs_log_mount(
636-
xfs_mount_t *mp,
637-
xfs_buftarg_t *log_target,
638-
xfs_daddr_t blk_offset,
639-
int num_bblks)
640-
{
641-
struct xlog *log;
642-
int error = 0;
643-
int min_logfsbs;
636+
xfs_mount_t *mp,
637+
struct xfs_buftarg *log_target,
638+
xfs_daddr_t blk_offset,
639+
int num_bblks)
640+
{
641+
struct xlog *log;
642+
int error = 0;
643+
int min_logfsbs;
644644

645645
if (!xfs_has_norecovery(mp)) {
646646
xfs_notice(mp, "Mounting V%d Filesystem %pU",

fs/xfs/xfs_mount.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ typedef struct xfs_mount {
9494
struct xfs_inode *m_rsumip; /* pointer to summary inode */
9595
struct xfs_inode *m_rootip; /* pointer to root directory */
9696
struct xfs_quotainfo *m_quotainfo; /* disk quota information */
97-
xfs_buftarg_t *m_ddev_targp; /* saves taking the address */
98-
xfs_buftarg_t *m_logdev_targp;/* ptr to log device */
99-
xfs_buftarg_t *m_rtdev_targp; /* ptr to rt device */
97+
struct xfs_buftarg *m_ddev_targp; /* data device */
98+
struct xfs_buftarg *m_logdev_targp;/* log device */
99+
struct xfs_buftarg *m_rtdev_targp; /* rt device */
100100
void __percpu *m_inodegc; /* percpu inodegc structures */
101101

102102
/*

0 commit comments

Comments
 (0)