]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
io_uring/net: use io_is_compat()
authorPavel Begunkov <asml.silence@gmail.com>
Mon, 24 Feb 2025 12:42:24 +0000 (12:42 +0000)
committerJens Axboe <axboe@kernel.dk>
Mon, 24 Feb 2025 19:11:06 +0000 (12:11 -0700)
Use io_is_compat() for consistency.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Reviewed-by: Anuj Gupta <anuj20.g@samsung.com>
Link: https://lore.kernel.org/r/fff93d9d08243284c5db5d546be766a82e85c130.1740400452.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
io_uring/net.c

index 10344b3a6d89cddb7218e9ed1e0fa9cb5ec75b24..1d1107fd5beb0d4ccd1de080df0d25cdf1d12477 100644 (file)
@@ -317,7 +317,7 @@ static int io_sendmsg_copy_hdr(struct io_kiocb *req,
        iomsg->msg.msg_iter.nr_segs = 0;
 
 #ifdef CONFIG_COMPAT
-       if (unlikely(req->ctx->compat)) {
+       if (io_is_compat(req->ctx)) {
                struct compat_msghdr cmsg;
 
                ret = io_compat_msg_copy_hdr(req, iomsg, &cmsg, ITER_SOURCE);
@@ -428,10 +428,9 @@ int io_sendmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
                req->buf_list = NULL;
        }
 
-#ifdef CONFIG_COMPAT
-       if (req->ctx->compat)
+       if (io_is_compat(req->ctx))
                sr->msg_flags |= MSG_CMSG_COMPAT;
-#endif
+
        if (unlikely(!io_msg_alloc_async(req)))
                return -ENOMEM;
        if (req->opcode != IORING_OP_SENDMSG)
@@ -717,7 +716,7 @@ static int io_recvmsg_copy_hdr(struct io_kiocb *req,
        iomsg->msg.msg_iter.nr_segs = 0;
 
 #ifdef CONFIG_COMPAT
-       if (unlikely(req->ctx->compat)) {
+       if (io_is_compat(req->ctx)) {
                struct compat_msghdr cmsg;
 
                ret = io_compat_msg_copy_hdr(req, iomsg, &cmsg, ITER_DEST);
@@ -829,10 +828,9 @@ int io_recvmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
                        return -EINVAL;
        }
 
-#ifdef CONFIG_COMPAT
-       if (req->ctx->compat)
+       if (io_is_compat(req->ctx))
                sr->msg_flags |= MSG_CMSG_COMPAT;
-#endif
+
        sr->nr_multishot_loops = 0;
        return io_recvmsg_prep_setup(req);
 }
@@ -1293,10 +1291,9 @@ int io_send_zc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
        if (zc->msg_flags & MSG_DONTWAIT)
                req->flags |= REQ_F_NOWAIT;
 
-#ifdef CONFIG_COMPAT
-       if (req->ctx->compat)
+       if (io_is_compat(req->ctx))
                zc->msg_flags |= MSG_CMSG_COMPAT;
-#endif
+
        if (unlikely(!io_msg_alloc_async(req)))
                return -ENOMEM;
        if (req->opcode != IORING_OP_SENDMSG_ZC)