Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-01 10:42:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

io_uring: clean leftovers after splitting issue

Browse Source 
Kill extra if in io_issue_sqe() and place send/recv[msg] calls
appropriately under switch's cases.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Pavel Begunkov 2020-10-10 18:34:12 +01:00 committed by Jens Axboe
parent a71976f3fa
commit 062d04d731
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs/io_uring.c
View File

@ -5831,18 +5831,16 @@ static int io_issue_sqe(struct io_kiocb *req, bool force_nonblock,
ret = io_sync_file_range(req, force_nonblock);
break;
case IORING_OP_SENDMSG:
ret = io_sendmsg(req, force_nonblock, cs);
break;
case IORING_OP_SEND:
if (req->opcode == IORING_OP_SENDMSG)
ret = io_sendmsg(req, force_nonblock, cs);
else
ret = io_send(req, force_nonblock, cs);
ret = io_send(req, force_nonblock, cs);
break;
case IORING_OP_RECVMSG:
ret = io_recvmsg(req, force_nonblock, cs);
break;
case IORING_OP_RECV:
if (req->opcode == IORING_OP_RECVMSG)
ret = io_recvmsg(req, force_nonblock, cs);
else
ret = io_recv(req, force_nonblock, cs);
ret = io_recv(req, force_nonblock, cs);
break;
case IORING_OP_TIMEOUT:
ret = io_timeout(req);