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>

diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index 1e85780411d57ede57b06edadc1f3cb01e05d830..1777d834fd54dab8532e5e26da9d169db5954a96 100644 (file)
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -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)

diff --git a/fs/xfs/xfs_buf.h b/fs/xfs/xfs_buf.h
index b470de08a46ca8e6e7c3b4dfe7e85110037f3949..b9216dee7810c1602c21f79d7311f34ce55ee3b9 100644 (file)
--- a/fs/xfs/xfs_buf.h
+++ b/fs/xfs/xfs_buf.h
@@ -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
 

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 1f68569e62ca090feaf54211ee6a3b0c513eac05..5004f23d344eddc47345d4d6b92d85d01ea7071f 100644 (file)
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -633,14 +633,14 @@ xlog_state_release_iclog(
  */
 int
 xfs_log_mount(
-       xfs_mount_t     *mp,
-       xfs_buftarg_t   *log_target,
-       xfs_daddr_t     blk_offset,
-       int             num_bblks)
-{
-       struct xlog     *log;
-       int             error = 0;
-       int             min_logfsbs;
+       xfs_mount_t             *mp,
+       struct xfs_buftarg      *log_target,
+       xfs_daddr_t             blk_offset,
+       int                     num_bblks)
+{
+       struct xlog             *log;
+       int                     error = 0;
+       int                     min_logfsbs;
 
        if (!xfs_has_norecovery(mp)) {
                xfs_notice(mp, "Mounting V%d Filesystem %pU",

diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
index e86dfe67894fb2dbaeb662c09151840e54719092..6c44e6db4d8624a8948c3b8b017f3126fe04e82e 100644 (file)
--- a/fs/xfs/xfs_mount.h
+++ b/fs/xfs/xfs_mount.h
@@ -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 */
 
        /*