From: Pavel Begunkov <asml.silence@gmail.com>
Date: Fri, 28 Feb 2020 07:36:35 +0000 (+0300)
Subject: io_uring: clean io_poll_complete
X-Git-Tag: v5.7-rc1~201^2~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0a20349f212dc725f5ddfd060e426fe6181d9c5;p=thirdparty%2Fkernel%2Flinux.git

io_uring: clean io_poll_complete

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

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 1ef20a2af10b0..f4c6661b33bcf 100644
--- 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);
 }