[PATCH 0/2] Maintainer and uapi header update

[PATCH 0/2] Maintainer and uapi header update

[Ammar Faizi]

From: Ammar Faizi <ammarfaizi2@gnuweeb.org>

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.

On Tue, 28 Jun 2022 10:12:27 -0600, Jens Axboe wrote:
> On 6/28/22 10:10 AM, Ammar Faizi wrote:
>> 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/f1feef16-6ea2-0653-238f-4aaee35060b6@kernel.dk

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 <bvanassche@acm.org>
Cc: Dylan Yudaken <dylany@fb.com>
Cc: Facebook Kernel Team <kernel-team@fb.com>
Signed-off-by: Ammar Faizi <ammarfaizi2@gnuweeb.org>
---

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
-- 
Ammar Faizi

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

[Ammar Faizi]

From: Ammar Faizi <ammarfaizi2@gnuweeb.org>

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

Signed-off-by: Ammar Faizi <ammarfaizi2@gnuweeb.org>
---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 8a5012ba6ff9..6dc55be41420 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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/
 
-- 
Ammar Faizi

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

[Ammar Faizi]

From: Ammar Faizi <ammarfaizi2@gnuweeb.org>

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.

Link: https://lore.kernel.org/io-uring/f1feef16-6ea2-0653-238f-4aaee35060b6@kernel.dk
Cc: Bart Van Assche <bvanassche@acm.org>
Cc: Dylan Yudaken <dylany@fb.com>
Cc: Facebook Kernel Team <kernel-team@fb.com>
Signed-off-by: Ammar Faizi <ammarfaizi2@gnuweeb.org>
---
 include/uapi/linux/io_uring.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h
index 1463cfecb56b..9e0b5c8d92ce 100644
--- a/include/uapi/linux/io_uring.h
+++ b/include/uapi/linux/io_uring.h
@@ -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
-- 
Ammar Faizi

Re: [PATCH 0/2] Maintainer and uapi header update

[Jens Axboe]

On 8/23/22 5:45 AM, Ammar Faizi wrote:
> From: Ammar Faizi <ammarfaizi2@gnuweeb.org>
> 
> 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.

Applied, thanks.

-- 
Jens Axboe