Skip to content

Commit 062d04d

Browse files
isilenceaxboe
authored andcommitted
io_uring: clean leftovers after splitting issue
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>
1 parent a71976f commit 062d04d

1 file changed

Lines changed: 6 additions & 8 deletions

File tree

fs/io_uring.c

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5831,18 +5831,16 @@ static int io_issue_sqe(struct io_kiocb *req, bool force_nonblock,
58315831
ret = io_sync_file_range(req, force_nonblock);
58325832
break;
58335833
case IORING_OP_SENDMSG:
5834+
ret = io_sendmsg(req, force_nonblock, cs);
5835+
break;
58345836
case IORING_OP_SEND:
5835-
if (req->opcode == IORING_OP_SENDMSG)
5836-
ret = io_sendmsg(req, force_nonblock, cs);
5837-
else
5838-
ret = io_send(req, force_nonblock, cs);
5837+
ret = io_send(req, force_nonblock, cs);
58395838
break;
58405839
case IORING_OP_RECVMSG:
5840+
ret = io_recvmsg(req, force_nonblock, cs);
5841+
break;
58415842
case IORING_OP_RECV:
5842-
if (req->opcode == IORING_OP_RECVMSG)
5843-
ret = io_recvmsg(req, force_nonblock, cs);
5844-
else
5845-
ret = io_recv(req, force_nonblock, cs);
5843+
ret = io_recv(req, force_nonblock, cs);
58465844
break;
58475845
case IORING_OP_TIMEOUT:
58485846
ret = io_timeout(req);

0 commit comments

Comments
 (0)