Skip to contentSkip to conversation

Maintainer and uapi header update

PATCH Applied Ammar Faizi 2 participants 4 messages Aug 23, 2022 io_uring

lore
Share & tools
lore
#0 lore raw

cover Maintainer and uapi header update

From: Ammar Faizi <[email protected]>

Hi Jens,

There are two patches in this series.

1) MAINTAINERS: Add include/linux/io_uring_types.h.

File include/linux/io_uring_types.h doesn't have a maintainer, add it to the io_uring section.

2) io_uring: uapi: Add extern "C" in io_uring.h for liburing.

Quoted 9 lines · Jens Axboe
Quoted 4 lines · Ammar Faizi

Or better add that to the kernel tree as well, it won't break the kernel because we have a __cplusplus guard here.

Jens what do you think?

It'd be nice to keep them fully in sync. If I recall correctly, the only differences right now is that clause, and the change to not using a zero sized array at the end of a struct (which is slated for the kernel too).

^ Do that.

Ref: https://lore.kernel.org/io-uring/[email protected]

Make it easy for liburing to integrate uapi header with the kernel. Previously, when this header changes, the liburing side can't directly copy this header file due to some small differences. Sync them.

Cc Bart Van Assche <[email protected]>
Cc Dylan Yudaken <[email protected]>
Cc Facebook Kernel Team <[email protected]>

---

Ammar Faizi (2):
MAINTAINERS: Add include/linux/io_uring_types.h
io_uring: uapi: Add extern "C" in io_uring.h for liburing

 MAINTAINERS                   | 1 +
 include/uapi/linux/io_uring.h | 8 ++++++++
 2 files changed, 9 insertions(+)

base-commit: 3f743e9bbb8fe20f4c477e4bf6341c4187a4a264

Signature · 1 line
Ammar Faizi
#1 lore raw

PATCH 1/2 MAINTAINERS: Add `include/linux/io_uring_types.h`

From: Ammar Faizi <[email protected]>

File include/linux/io_uring_types.h doesn't have a maintainer, add it to the io_uring section.

---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)
MAINTAINERS +1 -0
index 8a5012ba6ff9..6dc55be41420 100644
@@ -10657,6 +10657,7 @@ T:	git git://git.kernel.dk/linux-block
 T:	git git://git.kernel.dk/liburing
 F:	io_uring/
 F:	include/linux/io_uring.h
+F:	include/linux/io_uring_types.h
 F:	include/uapi/linux/io_uring.h
 F:	tools/io_uring/
 
Signature · 1 line
Ammar Faizi
#2 lore raw

PATCH 2/2 io_uring: uapi: Add `extern "C"` in io_uring.h for liburing

In reply to Ammar Faizi

From: Ammar Faizi <[email protected]>

Make it easy for liburing to integrate uapi header with the kernel. Previously, when this header changes, the liburing side can't directly copy this header file due to some small differences. Sync them.

---
 include/uapi/linux/io_uring.h | 8 ++++++++
 1 file changed, 8 insertions(+)
include/uapi/linux/io_uring.h +8 -0
index 1463cfecb56b..9e0b5c8d92ce 100644
@@ -12,6 +12,10 @@
 #include <linux/types.h>
 #include <linux/time_types.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * IO submission data structure (Submission Queue Entry)
  */
@@ -661,4 +665,8 @@ struct io_uring_recvmsg_out {
 	__u32 flags;
 };
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
Signature · 1 line
Ammar Faizi
maintainer Applied
#3 lore raw
In reply to Ammar Faizi
Quoted 4 lines · Ammar Faizi

From: Ammar Faizi <[email protected]>

Hi Jens,

Quoted 8 lines

There are two patches in this series.

1) MAINTAINERS: Add include/linux/io_uring_types.h.

File include/linux/io_uring_types.h doesn't have a maintainer, add it to the io_uring section.

2) io_uring: uapi: Add extern "C" in io_uring.h for liburing.

Applied, thanks.

Signature · 1 line
Jens Axboe