xfs: get rid of xfs_growfs_{data,log}_t

Such usage isn't encouraged by the kernel coding style. Leave the
definitions alone in case of userspace users.

Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Gao Xiang <hsiangkao@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>

diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
index 62600d7..a2a4070 100644 (file)
--- a/fs/xfs/xfs_fsops.c
+++ b/fs/xfs/xfs_fsops.c
@@ -25,8 +25,8 @@
  */
 static int
 xfs_growfs_data_private(
-       xfs_mount_t             *mp,            /* mount point for filesystem */
-       xfs_growfs_data_t       *in)            /* growfs data input struct */
+       struct xfs_mount        *mp,            /* mount point for filesystem */
+       struct xfs_growfs_data  *in)            /* growfs data input struct */
 {
        struct xfs_buf          *bp;
        int                     error;
@@ -35,7 +35,7 @@ xfs_growfs_data_private(
        xfs_rfsblock_t          nb, nb_div, nb_mod;
        xfs_rfsblock_t          delta;
        xfs_agnumber_t          oagcount;
-       xfs_trans_t             *tp;
+       struct xfs_trans        *tp;
        struct aghdr_init_data  id = {};
 
        nb = in->newblocks;
@@ -170,8 +170,8 @@ out_trans_cancel:
 
 static int
 xfs_growfs_log_private(
-       xfs_mount_t             *mp,    /* mount point for filesystem */
-       xfs_growfs_log_t        *in)    /* growfs log input struct */
+       struct xfs_mount        *mp,    /* mount point for filesystem */
+       struct xfs_growfs_log   *in)    /* growfs log input struct */
 {
        xfs_extlen_t            nb;
 
@@ -268,7 +268,7 @@ out_error:
 int
 xfs_growfs_log(
        xfs_mount_t             *mp,
-       xfs_growfs_log_t        *in)
+       struct xfs_growfs_log   *in)
 {
        int error;
 

diff --git a/fs/xfs/xfs_fsops.h b/fs/xfs/xfs_fsops.h
index 92869f6..2cffe51 100644 (file)
--- a/fs/xfs/xfs_fsops.h
+++ b/fs/xfs/xfs_fsops.h
@@ -6,8 +6,8 @@
 #ifndef __XFS_FSOPS_H__
 #define        __XFS_FSOPS_H__
 
-extern int xfs_growfs_data(xfs_mount_t *mp, xfs_growfs_data_t *in);
-extern int xfs_growfs_log(xfs_mount_t *mp, xfs_growfs_log_t *in);
+extern int xfs_growfs_data(struct xfs_mount *mp, struct xfs_growfs_data *in);
+extern int xfs_growfs_log(struct xfs_mount *mp, struct xfs_growfs_log *in);
 extern void xfs_fs_counts(xfs_mount_t *mp, xfs_fsop_counts_t *cnt);
 extern int xfs_reserve_blocks(xfs_mount_t *mp, uint64_t *inval,
                                xfs_fsop_resblks_t *outval);

diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index 78f9654..248083e 100644 (file)
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -2251,7 +2251,7 @@ xfs_file_ioctl(
        }
 
        case XFS_IOC_FSGROWFSDATA: {
-               xfs_growfs_data_t in;
+               struct xfs_growfs_data in;
 
                if (copy_from_user(&in, arg, sizeof(in)))
                        return -EFAULT;
@@ -2265,7 +2265,7 @@ xfs_file_ioctl(
        }
 
        case XFS_IOC_FSGROWFSLOG: {
-               xfs_growfs_log_t in;
+               struct xfs_growfs_log in;
 
                if (copy_from_user(&in, arg, sizeof(in)))
                        return -EFAULT;