On Tue, Aug 20, 2019 at 01:31:36PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
>
> Amend the fs geometry ioctl documentation to cover the new v5 structure.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> ---
> libfrog/fsgeom.c | 4 ++++
> man/man2/ioctl_xfs_fsop_geometry.2 | 8 ++++++++
> 2 files changed, 12 insertions(+)
>
>
> diff --git a/libfrog/fsgeom.c b/libfrog/fsgeom.c
> index 06e4e663..159738c5 100644
> --- a/libfrog/fsgeom.c
> +++ b/libfrog/fsgeom.c
> @@ -88,6 +88,10 @@ xfrog_geometry(
> if (!ret)
> return 0;
>
> + ret = ioctl(fd, XFS_IOC_FSGEOMETRY_V4, fsgeo);
> + if (!ret)
> + return 0;
> +
> return ioctl(fd, XFS_IOC_FSGEOMETRY_V1, fsgeo);
> }
This hunk is in the previous patch.
>
> diff --git a/man/man2/ioctl_xfs_fsop_geometry.2 b/man/man2/ioctl_xfs_fsop_geometry.2
> index 68e3387d..365bda8b 100644
> --- a/man/man2/ioctl_xfs_fsop_geometry.2
> +++ b/man/man2/ioctl_xfs_fsop_geometry.2
> @@ -12,6 +12,8 @@ ioctl_xfs_fsop_geometry \- report XFS filesystem layout and features
> .PP
> .BI "int ioctl(int " fd ", XFS_IOC_FSOP_GEOMETRY, struct xfs_fsop_geom*" arg );
> .br
> +.BI "int ioctl(int " fd ", XFS_IOC_FSOP_GEOMETRY_V4, struct xfs_fsop_geom_v4 *" arg );
> +.br
> .BI "int ioctl(int " fd ", XFS_IOC_FSOP_GEOMETRY_V1, struct xfs_fsop_geom_v1 *" arg );
> .SH DESCRIPTION
> Report the details of an XFS filesystem layout, features, and other descriptive items.
> @@ -43,6 +45,9 @@ struct xfs_fsop_geom {
> /* struct xfs_fsop_geom_v1 stops here. */
>
> __u32 logsunit;
> + /* struct xfs_fsop_geom_v4 stops here. */
> +
> + __u64 reserved[18];
> };
> .fi
> .in
And this looks like a stray, too.
The man page changes look fine, though :P
Cheers,
Dave.
--
Dave Chinner
david@xxxxxxxxxxxxx
