|
 |
1965e5 |
From ff85f882bbd8a399e036b8465520d1ff0867f4f1 Mon Sep 17 00:00:00 2001
|
|
|
1965e5 |
From: Chris Packham <chris.packham@alliedtelesis.co.nz>
|
|
|
1965e5 |
Date: Mon, 15 Jun 2020 22:01:25 +1200
|
|
|
1965e5 |
Subject: [PATCH 113/115] io_uring: Remove struct io_cqring_offsets compile
|
|
|
1965e5 |
time asserts
|
|
|
1965e5 |
|
|
|
1965e5 |
The generated types/check-io_uring.c already checks the kernel's struct
|
|
|
1965e5 |
io_cqring_offsets for compatibility with the strace definition so
|
|
|
1965e5 |
there's no need for manual checks.
|
|
|
1965e5 |
|
|
|
1965e5 |
* io_uring.c [HAVE_STRUCT_IO_CQRING_OFFSETS]: Remove static_asserts.
|
|
|
1965e5 |
---
|
|
|
1965e5 |
io_uring.c | 15 ---------------
|
|
|
1965e5 |
1 file changed, 15 deletions(-)
|
|
|
1965e5 |
|
|
|
1965e5 |
diff --git a/io_uring.c b/io_uring.c
|
|
|
1965e5 |
index ac1807b..fd83313 100644
|
|
|
1965e5 |
--- a/io_uring.c
|
|
|
1965e5 |
+++ b/io_uring.c
|
|
|
1965e5 |
@@ -17,21 +17,6 @@
|
|
|
1965e5 |
#include "xlat/uring_enter_flags.h"
|
|
|
1965e5 |
#include "xlat/uring_register_opcodes.h"
|
|
|
1965e5 |
|
|
|
1965e5 |
-#ifdef HAVE_STRUCT_IO_CQRING_OFFSETS
|
|
|
1965e5 |
-# ifdef HAVE_STRUCT_IO_CQRING_OFFSETS_RESV
|
|
|
1965e5 |
-static_assert(offsetof(struct_io_cqring_offsets, resv)
|
|
|
1965e5 |
- >= offsetof(struct io_cqring_offsets, resv),
|
|
|
1965e5 |
- "struct io_cqring_offsets.resv offset mismatch"
|
|
|
1965e5 |
- ", please update the decoder");
|
|
|
1965e5 |
-static_assert(sizeof_field(struct_io_cqring_offsets, resv)
|
|
|
1965e5 |
- <= sizeof_field(struct io_cqring_offsets, resv),
|
|
|
1965e5 |
- "struct io_cqring_offsets.resv size mismatch"
|
|
|
1965e5 |
- ", please update the decoder");
|
|
|
1965e5 |
-# else /* !HAVE_STRUCT_IO_CQRING_OFFSETS_RESV */
|
|
|
1965e5 |
-static_assert(0, "struct io_cqring_offsets.resv is missing"
|
|
|
1965e5 |
- ", please update the decoder");
|
|
|
1965e5 |
-# endif
|
|
|
1965e5 |
-#endif /* HAVE_STRUCT_IO_CQRING_OFFSETS */
|
|
|
1965e5 |
#ifdef HAVE_STRUCT_IO_URING_PARAMS
|
|
|
1965e5 |
# ifdef HAVE_STRUCT_IO_URING_PARAMS_RESV
|
|
|
1965e5 |
static_assert(offsetof(struct_io_uring_params, resv)
|
|
|
1965e5 |
--
|
|
|
1965e5 |
2.1.4
|
|
|
1965e5 |
|