Re: [PATCH 7/9] xfs: wire up the v5 INUMBERS ioctl

Allison Collins
2019-06-05T22:30:55Z

On 5/29/19 3:28 PM, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> Wire up the v5 INUMBERS ioctl and rename the old one to v1.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
> fs/xfs/libxfs/xfs_fs.h | 8 ++++++++
> fs/xfs/xfs_ioctl.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++
> fs/xfs/xfs_ioctl32.c | 1 +
> fs/xfs/xfs_ondisk.h | 1 +
> 4 files changed, 61 insertions(+)
>
>
> diff --git a/fs/xfs/libxfs/xfs_fs.h b/fs/xfs/libxfs/xfs_fs.h
> index 95d0411dae9b..f9f35139d4b7 100644
> --- a/fs/xfs/libxfs/xfs_fs.h
> +++ b/fs/xfs/libxfs/xfs_fs.h
> @@ -493,6 +493,13 @@ struct xfs_bulkstat_single_req {
> struct xfs_bulkstat bulkstat;
> };
>
> +struct xfs_inumbers_req {
> + struct xfs_bulk_ireq hdr;
> + struct xfs_inumbers inumbers[];
> +};
> +#define XFS_INUMBERS_REQ_SIZE(nr) (sizeof(struct xfs_inumbers_req) + \
> + (nr) * sizeof(struct xfs_inumbers))
> +
> /*
> * Error injection.
> */
> @@ -796,6 +803,7 @@ struct xfs_scrub_metadata {
> #define XFS_IOC_FSGEOMETRY _IOR ('X', 126, struct xfs_fsop_geom)
> #define XFS_IOC_BULKSTAT _IOR ('X', 127, struct xfs_bulkstat_req)
> #define XFS_IOC_BULKSTAT_SINGLE _IOR ('X', 128, struct xfs_bulkstat_single_req)
> +#define XFS_IOC_INUMBERS _IOR ('X', 129, struct xfs_inumbers_req)
> /* XFS_IOC_GETFSUUID ---------- deprecated 140 */
>
>
> diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
> index f6971eb9561e..294039c2ea75 100644
> --- a/fs/xfs/xfs_ioctl.c
> +++ b/fs/xfs/xfs_ioctl.c
> @@ -1006,6 +1006,55 @@ xfs_ioc_bulkstat_single(
> return 0;
> }
>
> +STATIC int
> +xfs_inumbers_fmt(
> + struct xfs_ibulk *breq,
> + const struct xfs_inumbers *igrp)
> +{
> + if (copy_to_user(breq->ubuffer, igrp, sizeof(struct xfs_inumbers)))
> + return -EFAULT;
> + return xfs_ibulk_advance(breq, sizeof(struct xfs_inumbers));
> +}
> +
> +/* Handle the v5 inumbers ioctl. */
> +STATIC int
> +xfs_ioc_inumbers(
> + struct xfs_mount *mp,
> + unsigned int cmd,
> + struct xfs_inumbers_req __user *arg)
> +{
> + struct xfs_bulk_ireq hdr;
> + struct xfs_ibulk breq = {
> + .mp = mp,
> + };
> + int error;
> +
> + if (!capable(CAP_SYS_ADMIN))
> + return -EPERM;
> +
> + if (XFS_FORCED_SHUTDOWN(mp))
> + return -EIO;
> +
> + if (copy_from_user(&hdr, &arg->hdr, sizeof(hdr)))
> + return -EFAULT;
> +
> + error = xfs_bulk_ireq_setup(mp, &hdr, &breq, arg->inumbers);
> + if (error < 0)
> + return error;
> +
> + if (!error)
> + error = xfs_inumbers(&breq, xfs_inumbers_fmt);
> +
Ditto on comments from patch 5 if you choose to change the teardown
params. Otherwise the rest looks ok.

Allison
> + error = xfs_bulk_ireq_teardown(&hdr, &breq, error);
> + if (error)
> + return error;
> +
> + if (copy_to_user(&arg->hdr, &hdr, sizeof(hdr)))
> + return -EFAULT;
> +
> + return 0;
> +}
> +
> STATIC int
> xfs_ioc_fsgeometry(
> struct xfs_mount *mp,
> @@ -2174,6 +2223,8 @@ xfs_file_ioctl(
> return xfs_ioc_bulkstat(mp, cmd, arg);
> case XFS_IOC_BULKSTAT_SINGLE:
> return xfs_ioc_bulkstat_single(mp, cmd, arg);
> + case XFS_IOC_INUMBERS:
> + return xfs_ioc_inumbers(mp, cmd, arg);
>
> case XFS_IOC_FSGEOMETRY_V1:
> return xfs_ioc_fsgeometry(mp, arg, 3);
> diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c
> index 08a90e3459d1..772086998ab3 100644
> --- a/fs/xfs/xfs_ioctl32.c
> +++ b/fs/xfs/xfs_ioctl32.c
> @@ -578,6 +578,7 @@ xfs_file_compat_ioctl(
> case XFS_IOC_SCRUB_METADATA:
> case XFS_IOC_BULKSTAT:
> case XFS_IOC_BULKSTAT_SINGLE:
> + case XFS_IOC_INUMBERS:
> return xfs_file_ioctl(filp, cmd, p);
> #if !defined(BROKEN_X86_ALIGNMENT) || defined(CONFIG_X86_X32)
> /*
> diff --git a/fs/xfs/xfs_ondisk.h b/fs/xfs/xfs_ondisk.h
> index fa1252657b08..e390e65d2438 100644
> --- a/fs/xfs/xfs_ondisk.h
> +++ b/fs/xfs/xfs_ondisk.h
> @@ -151,6 +151,7 @@ xfs_check_ondisk_structs(void)
> XFS_CHECK_STRUCT_SIZE(struct xfs_inumbers, 24);
> XFS_CHECK_STRUCT_SIZE(struct xfs_bulkstat_req, 64);
> XFS_CHECK_STRUCT_SIZE(struct xfs_bulkstat_single_req, 224);
> + XFS_CHECK_STRUCT_SIZE(struct xfs_inumbers_req, 64);
> }
>
> #endif /* __XFS_ONDISK_H */
>