[PATCH 04/12] man: document the new v5 fs geometry ioctl structures

Darrick J. Wong
2019-08-20T20:31:42Z

From: Darrick J. Wong <darrick.wong@oracle.com>

Amend the fs geometry ioctl documentation to cover the new v5 structure.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
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);
}

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
@@ -124,6 +129,9 @@ underlying log device, in filesystem blocks.
This field is meaningful only if the flag
.B XFS_FSOP_GEOM_FLAGS_LOGV2
is set.
+.PP
+.I reserved
+is set to zero.
.SH FILESYSTEM FEATURE FLAGS
Filesystem features are reported to userspace as a combination the following