Skip to contentSkip to conversation

xfsprogs: provide a few compatibility typedefs

PATCH Superseded Christoph Hellwig 2 participants 3 messages Aug 30, 2019

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 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..9ae067dc 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
+typedef struct xfs_inogrp xfs_inogrp_t;
+
 #endif	/* __XFS_H__ */
Signature · 1 line
2.20.1
#1 lore raw
Quoted 14 lines · Christoph Hellwig

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 +0 -0
index f2f675df..9ae067dc 100644

include/xfs.h extern int xfs_assert_largefile[sizeof(off_t)-8]; · line 46

Quoted 10 lines
include/xfs.h +7 -0
@@ -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

Missing a semicolon here?

--D

Quoted 6 lines
include/xfs.h +2 -0
+typedef struct xfs_inogrp xfs_inogrp_t;
+
 #endif	/* __XFS_H__ */
Signature · 1 line
2.20.1
#2 lore raw
Quoted 18 lines · Darrick J. Wong
Quoted 17 lines · Christoph Hellwig

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 +0 -0
index f2f675df..9ae067dc 100644
@@ -37,4 +37,13 @@ extern int xfs_assert_largefile[sizeof(off_t)-8];
 #include <xfs/xfs_types.h>
 #include <xfs/xfs_fs.h>
 
Quoted 9 lines

include/xfs.h extern int xfs_assert_largefile[sizeof(off_t)-8]; · line 46

Quoted 7 lines
include/xfs.h +7 -0
+/*
+ * 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

Missing a semicolon here?

Yes. And that did blew up when I compiled it and then I fixed it. Guess I failed to ammend the commit afterwards, sigh..