Commit 7d009165 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring: cleanup io_import_fixed() 



Clean io_import_fixed() call site and make it return proper type.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent cf6fd4bd

fs/io_uring.c

+5 −7
Original line number Diff line number Diff line
@@ -1490,7 +1490,7 @@ static void kiocb_done(struct kiocb *kiocb, ssize_t ret, struct io_kiocb **nxt, 
		io_rw_done(kiocb, ret);

}



static int io_import_fixed(struct io_ring_ctx *ctx, int rw,

static ssize_t io_import_fixed(struct io_ring_ctx *ctx, int rw,

			       const struct io_uring_sqe *sqe,

			       struct iov_iter *iter)

{
@@ -1581,11 +1581,9 @@ static ssize_t io_import_iovec(int rw, struct io_kiocb *req, 
	 * flag.

	 */

	opcode = READ_ONCE(sqe->opcode);

	if (opcode == IORING_OP_READ_FIXED ||

	    opcode == IORING_OP_WRITE_FIXED) {

		ssize_t ret = io_import_fixed(req->ctx, rw, sqe, iter);

	if (opcode == IORING_OP_READ_FIXED || opcode == IORING_OP_WRITE_FIXED) {

		*iovec = NULL;

		return ret;

		return io_import_fixed(req->ctx, rw, sqe, iter);

	}



	if (!req->has_user)