projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7d67af2
)
io_uring: clean io_poll_complete
author
Pavel Begunkov
<asml.silence@gmail.com>
Fri, 28 Feb 2020 07:36:35 +0000
(10:36 +0300)
committer
Jens Axboe
<axboe@kernel.dk>
Mon, 2 Mar 2020 21:04:37 +0000
(14:04 -0700)
Deduplicate call to io_cqring_fill_event(), plain and easy
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
fs/io_uring.c
patch
|
blob
|
history
diff --git
a/fs/io_uring.c
b/fs/io_uring.c
index 1ef20a2af10b03fae7fefb3e309d23197f4b73c2..f4c6661b33bcf710c617e34cbbc097a531b5339a 100644
(file)
--- a/
fs/io_uring.c
+++ b/
fs/io_uring.c
@@
-3641,10
+3641,7
@@
static void io_poll_complete(struct io_kiocb *req, __poll_t mask, int error)
struct io_ring_ctx *ctx = req->ctx;
req->poll.done = true;
- if (error)
- io_cqring_fill_event(req, error);
- else
- io_cqring_fill_event(req, mangle_poll(mask));
+ io_cqring_fill_event(req, error ? error : mangle_poll(mask));
io_commit_cqring(ctx);
}