On Thu, Aug 29, 2019 at 09:20:27PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
>
> Revert the #define redirection of XFS_IOC_FSGEOMETRY to the old V4
> ioctl.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> ---
> libxfs/xfs_fs.h | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
>
> diff --git a/libxfs/xfs_fs.h b/libxfs/xfs_fs.h
> index 67fceffc..31ac6323 100644
> --- a/libxfs/xfs_fs.h
> +++ b/libxfs/xfs_fs.h
> @@ -822,9 +822,7 @@ struct xfs_scrub_metadata {
> #define XFS_IOC_ATTRMULTI_BY_HANDLE _IOW ('X', 123, struct xfs_fsop_attrmulti_handlereq)
> #define XFS_IOC_FSGEOMETRY_V4 _IOR ('X', 124, struct xfs_fsop_geom_v4)
> #define XFS_IOC_GOINGDOWN _IOR ('X', 125, uint32_t)
> -/* For compatibility, for now */
> -/* #define XFS_IOC_FSGEOMETRY _IOR ('X', 126, struct xfs_fsop_geom_v5) */
> -#define XFS_IOC_FSGEOMETRY XFS_IOC_FSGEOMETRY_V4
> +#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_INUMBERS _IOR ('X', 128, struct xfs_inumbers_req)
Looks fine, but can we change the order of this patch in the series
until after all the geometry callers have been converted to use the
common function with fallback from v5 to v4 calls?
Reviewed-by: Dave Chinner <dchinner@xxxxxxxxxx>
--
Dave Chinner
david@xxxxxxxxxxxxx
