On Sat, Jan 09, 2021 at 03:09:17AM +0800, Gao Xiang wrote:
> Such usage isn't encouraged by the kernel coding style.
>
> Signed-off-by: Gao Xiang <hsiangkao@xxxxxxxxxx>
> ---
> fs/xfs/libxfs/xfs_fs.h | 4 ++--
> fs/xfs/xfs_fsops.c | 12 ++++++------
> fs/xfs/xfs_fsops.h | 4 ++--
> fs/xfs/xfs_ioctl.c | 4 ++--
> 4 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_fs.h b/fs/xfs/libxfs/xfs_fs.h
> index 2a2e3cfd94f0..a17313efc1fe 100644
> --- a/fs/xfs/libxfs/xfs_fs.h
> +++ b/fs/xfs/libxfs/xfs_fs.h
> @@ -308,12 +308,12 @@ struct xfs_ag_geometry {
> typedef struct xfs_growfs_data {
> __u64 newblocks; /* new data subvol size, fsblocks */
> __u32 imaxpct; /* new inode space percentage limit */
> -} xfs_growfs_data_t;
> +};
So long as Eric is ok with fixing this up in xfs_fs_compat.h in
userspace,
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
--D
>
> typedef struct xfs_growfs_log {
> __u32 newblocks; /* new log size, fsblocks */
> __u32 isint; /* 1 if new log is internal */
> -} xfs_growfs_log_t;
> +};
>
> typedef struct xfs_growfs_rt {
> __u64 newblocks; /* new realtime size, fsblocks */
> diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
> index d254588f6e21..6c5f6a50da2e 100644
> --- 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_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 @@ xfs_growfs_data_private(
>
> 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 @@ xfs_growfs_data(
> 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 92869f6ec8d3..d7e9af4a28eb 100644
> --- 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(xfs_mount_t *mp, struct xfs_growfs_data *in);
> +extern int xfs_growfs_log(xfs_mount_t *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 3fbd98f61ea5..a62520f49ec5 100644
> --- a/fs/xfs/xfs_ioctl.c
> +++ b/fs/xfs/xfs_ioctl.c
> @@ -2260,7 +2260,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;
> @@ -2274,7 +2274,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;
> --
> 2.27.0
>
