* [PATCH] io_uring: use labeled array init in io_op_defs
@ 2020-01-18 18:35 Pavel Begunkov
2020-01-18 20:46 ` Jens Axboe
0 siblings, 1 reply; 2+ messages in thread
From: Pavel Begunkov @ 2020-01-18 18:35 UTC (permalink / raw)
To: Jens Axboe, io-uring, linux-kernel
Don't rely on implicit ordering of IORING_OP_ and explicitly place them
at a right place in io_op_defs. Now former comments are now a part of
the code and won't ever outdate.
Signed-off-by: Pavel Begunkov <[email protected]>
---
fs/io_uring.c | 91 ++++++++++++++++-----------------------------------
1 file changed, 29 insertions(+), 62 deletions(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index cf5bad51f752..09503d1e9e45 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -604,151 +604,118 @@ struct io_op_def {
};
static const struct io_op_def io_op_defs[] = {
- {
- /* IORING_OP_NOP */
- },
- {
- /* IORING_OP_READV */
+ [IORING_OP_NOP] = {},
+ [IORING_OP_READV] = {
.async_ctx = 1,
.needs_mm = 1,
.needs_file = 1,
.unbound_nonreg_file = 1,
},
- {
- /* IORING_OP_WRITEV */
+ [IORING_OP_WRITEV] = {
.async_ctx = 1,
.needs_mm = 1,
.needs_file = 1,
.hash_reg_file = 1,
.unbound_nonreg_file = 1,
},
- {
- /* IORING_OP_FSYNC */
+ [IORING_OP_FSYNC] = {
.needs_file = 1,
},
- {
- /* IORING_OP_READ_FIXED */
+ [IORING_OP_READ_FIXED] = {
.needs_file = 1,
.unbound_nonreg_file = 1,
},
- {
- /* IORING_OP_WRITE_FIXED */
+ [IORING_OP_WRITE_FIXED] = {
.needs_file = 1,
.hash_reg_file = 1,
.unbound_nonreg_file = 1,
},
- {
- /* IORING_OP_POLL_ADD */
+ [IORING_OP_POLL_ADD] = {
.needs_file = 1,
.unbound_nonreg_file = 1,
},
- {
- /* IORING_OP_POLL_REMOVE */
- },
- {
- /* IORING_OP_SYNC_FILE_RANGE */
+ [IORING_OP_POLL_REMOVE] = {},
+ [IORING_OP_SYNC_FILE_RANGE] = {
.needs_file = 1,
},
- {
- /* IORING_OP_SENDMSG */
+ [IORING_OP_SENDMSG] = {
.async_ctx = 1,
.needs_mm = 1,
.needs_file = 1,
.unbound_nonreg_file = 1,
},
- {
- /* IORING_OP_RECVMSG */
+ [IORING_OP_RECVMSG] = {
.async_ctx = 1,
.needs_mm = 1,
.needs_file = 1,
.unbound_nonreg_file = 1,
},
- {
- /* IORING_OP_TIMEOUT */
+ [IORING_OP_TIMEOUT] = {
.async_ctx = 1,
.needs_mm = 1,
},
- {
- /* IORING_OP_TIMEOUT_REMOVE */
- },
- {
- /* IORING_OP_ACCEPT */
+ [IORING_OP_TIMEOUT_REMOVE] = {},
+ [IORING_OP_ACCEPT] = {
.needs_mm = 1,
.needs_file = 1,
.unbound_nonreg_file = 1,
},
- {
- /* IORING_OP_ASYNC_CANCEL */
- },
- {
- /* IORING_OP_LINK_TIMEOUT */
+ [IORING_OP_ASYNC_CANCEL] = {},
+ [IORING_OP_LINK_TIMEOUT] = {
.async_ctx = 1,
.needs_mm = 1,
},
- {
- /* IORING_OP_CONNECT */
+ [IORING_OP_CONNECT] = {
.async_ctx = 1,
.needs_mm = 1,
.needs_file = 1,
.unbound_nonreg_file = 1,
},
- {
- /* IORING_OP_FALLOCATE */
+ [IORING_OP_FALLOCATE] = {
.needs_file = 1,
},
- {
- /* IORING_OP_OPENAT */
+ [IORING_OP_OPENAT] = {
.needs_file = 1,
.fd_non_neg = 1,
},
- {
- /* IORING_OP_CLOSE */
+ [IORING_OP_CLOSE] = {
.needs_file = 1,
},
- {
- /* IORING_OP_FILES_UPDATE */
+ [IORING_OP_FILES_UPDATE] = {
.needs_mm = 1,
},
- {
- /* IORING_OP_STATX */
+ [IORING_OP_STATX] = {
.needs_mm = 1,
.needs_file = 1,
.fd_non_neg = 1,
},
- {
- /* IORING_OP_READ */
+ [IORING_OP_READ] = {
.needs_mm = 1,
.needs_file = 1,
.unbound_nonreg_file = 1,
},
- {
- /* IORING_OP_WRITE */
+ [IORING_OP_WRITE] = {
.needs_mm = 1,
.needs_file = 1,
.unbound_nonreg_file = 1,
},
- {
- /* IORING_OP_FADVISE */
+ [IORING_OP_FADVISE] = {
.needs_file = 1,
},
- {
- /* IORING_OP_MADVISE */
+ [IORING_OP_MADVISE] = {
.needs_mm = 1,
},
- {
- /* IORING_OP_SEND */
+ [IORING_OP_SEND] = {
.needs_mm = 1,
.needs_file = 1,
.unbound_nonreg_file = 1,
},
- {
- /* IORING_OP_RECV */
+ [IORING_OP_RECV] = {
.needs_mm = 1,
.needs_file = 1,
.unbound_nonreg_file = 1,
},
- {
- /* IORING_OP_OPENAT2 */
+ [IORING_OP_OPENAT2] = {
.needs_file = 1,
.fd_non_neg = 1,
},
--
2.24.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] io_uring: use labeled array init in io_op_defs
2020-01-18 18:35 [PATCH] io_uring: use labeled array init in io_op_defs Pavel Begunkov
@ 2020-01-18 20:46 ` Jens Axboe
0 siblings, 0 replies; 2+ messages in thread
From: Jens Axboe @ 2020-01-18 20:46 UTC (permalink / raw)
To: Pavel Begunkov, io-uring, linux-kernel
On 1/18/20 11:35 AM, Pavel Begunkov wrote:
> Don't rely on implicit ordering of IORING_OP_ and explicitly place them
> at a right place in io_op_defs. Now former comments are now a part of
> the code and won't ever outdate.
Looks good to me, thanks. Applied.
--
Jens Axboe
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-01-18 20:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-18 18:35 [PATCH] io_uring: use labeled array init in io_op_defs Pavel Begunkov
2020-01-18 20:46 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox