diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2020-10-10 20:34:12 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-10-10 21:49:25 +0300 |
| commit | 062d04d73168d1d7109b75600a53a6a361d1fda8 (patch) | |
| tree | ae1e2ebd4b46707df85b7bb235d49797e48207cf /fs/io_uring.c | |
| parent | a71976f3fa474d0aa9b33fc2ecaa67af6103bb71 (diff) | |
| download | linux-062d04d73168d1d7109b75600a53a6a361d1fda8.tar.xz | |
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>
Diffstat (limited to 'fs/io_uring.c')
| -rw-r--r-- | fs/io_uring.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 3ce72d48eb21..2e0105c373ae 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -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); |