From: Jens Axboe <axboe@kernel.dk>
Date: Tue, 3 Dec 2019 18:23:54 +0000 (-0700)
Subject: io_uring: handle connect -EINPROGRESS like -EAGAIN
X-Git-Tag: for-linus-20191205~10
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=87f80d623c6c93c721b2aaead8a45e848bc8ffbf;p=linux-block.git

io_uring: handle connect -EINPROGRESS like -EAGAIN

Right now we return it to userspace, which means the application has
to poll for the socket to be writeable. Let's just treat it like
-EAGAIN and have io_uring handle it internally, this makes it much
easier to use.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/fs/io_uring.c b/fs/io_uring.c
index f7985f270d4a..6c22a277904e 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -2242,7 +2242,7 @@ static int io_connect(struct io_kiocb *req, const struct io_uring_sqe *sqe,
 
 	ret = __sys_connect_file(req->file, &io->connect.address, addr_len,
 					file_flags);
-	if (ret == -EAGAIN && force_nonblock) {
+	if ((ret == -EAGAIN || ret == -EINPROGRESS) && force_nonblock) {
 		io = kmalloc(sizeof(*io), GFP_KERNEL);
 		if (!io) {
 			ret = -ENOMEM;