On Fri, Aug 30, 2019 at 05:03:27PM +0200, Christoph Hellwig wrote:
> Add back four typedefs that allow xfsdump to compile against the
> headers from the latests xfsprogs.
>
> Reported-by: Murphy Zhou <jencce.kernel@xxxxxxxxx>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
> include/xfs.h | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/include/xfs.h b/include/xfs.h
> index f2f675df..35435b18 100644
> --- a/include/xfs.h
> +++ b/include/xfs.h
> @@ -37,4 +37,13 @@ extern int xfs_assert_largefile[sizeof(off_t)-8];
> #include <xfs/xfs_types.h>
> #include <xfs/xfs_fs.h>
>
> +/*
> + * Backards compatibility for users of this header, now that the kernel
> + * removed these typedefs from xfs_fs.h.
> + */
> +typedef struct xfs_bstat xfs_bstat_t;
> +typedef struct xfs_fsop_bulkreq xfs_fsop_bulkreq_t;
> +typedef struct xfs_fsop_geom_v1 xfs_fsop;
Still got build failure about this one.
Either change this line to:
+typedef struct xfs_fsop_geom_v1 xfs_fsop_geom_v1_t;
Or delete this line add this in xfsdump:
---
diff --git a/common/fs.c b/common/fs.c
index a4c175c..ff8c75a 100644
--- a/common/fs.c
+++ b/common/fs.c
@@ -204,7 +204,7 @@ fs_mounted(char *typs, char *chrs, char *mnts, uuid_t *idp)
int
fs_getid(char *mnts, uuid_t *idb)
{
- xfs_fsop_geom_v1_t geo;
+ struct xfs_fsop_geom_v1 geo;
int fd;
fd = open(mnts, O_RDONLY);
---
I prefer the later one since it's the only one, no need for a typedef.
Thanks,
Murphy
> +typedef struct xfs_inogrp xfs_inogrp_t;
> +
> #endif /* __XFS_H__ */
> --
> 2.20.1
>
