Skip to contentSkip to conversation

xfsprogs: provide a few compatibility typedefs

PATCH In review Christoph Hellwig 3 participants 3 messages Sep 3, 2019 – Sep 4, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 xfsprogs: provide a few compatibility typedefs

Add back four typedefs that allow xfsdump to compile against the headers from the latests xfsprogs.

---
 include/xfs.h | 9 +++++++++
 1 file changed, 9 insertions(+)
include/xfs.h +9 -0
index f2f675df..9c03d6bd 100644
@@ -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_geom_v1_t;
+typedef struct xfs_inogrp xfs_inogrp_t;
+
 #endif	/* __XFS_H__ */
Signature · 1 line
2.20.1
Reviewed-by on v3 1/1
#1 lore raw
Quoted 5 lines · Christoph Hellwig

Add back four typedefs that allow xfsdump to compile against the headers from the latests xfsprogs.

Looks ok (though really I looked at the previous broken version and look how far that got us :P)

--D

Quoted 25 lines
---
 include/xfs.h | 9 +++++++++
 1 file changed, 9 insertions(+)
include/xfs.h +9 -0
index f2f675df..9c03d6bd 100644
@@ -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_geom_v1_t;
+typedef struct xfs_inogrp xfs_inogrp_t;
+
 #endif	/* __XFS_H__ */
Signature · 1 line
2.20.1
#2 lore raw
In reply to Christoph Hellwig
Quoted 5 lines · Christoph Hellwig

Add back four typedefs that allow xfsdump to compile against the headers from the latests xfsprogs.

Works fine. Thanks~

Quoted 25 lines
---
 include/xfs.h | 9 +++++++++
 1 file changed, 9 insertions(+)
include/xfs.h +9 -0
index f2f675df..9c03d6bd 100644
@@ -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_geom_v1_t;
+typedef struct xfs_inogrp xfs_inogrp_t;
+
 #endif	/* __XFS_H__ */
Signature · 1 line
2.20.1