Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Dylan Yudaken <dylany@fb.com>
To:     Jens Axboe <axboe@kernel.dk>,
        Pavel Begunkov <asml.silence@gmail.com>
CC:     <io-uring@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        <kernel-team@fb.com>, Dylan Yudaken <dylany@fb.com>
Subject: [PATCH 3/3] io_uring: remove io_register_submitter
Date:   Mon, 26 Sep 2022 07:03:04 -0700
Message-ID: <20220926140304.1973990-4-dylany@fb.com>
In-Reply-To: <20220926140304.1973990-1-dylany@fb.com>
References: <20220926140304.1973990-1-dylany@fb.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain
Precedence: bulk

this is no longer needed, as submitter_task is set at creation time.

Signed-off-by: Dylan Yudaken <dylany@fb.com>
---
 io_uring/tctx.c | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/io_uring/tctx.c b/io_uring/tctx.c
index dd0205fcdb13..4324b1cf1f6a 100644
--- a/io_uring/tctx.c
+++ b/io_uring/tctx.c
@@ -91,20 +91,6 @@ __cold int io_uring_alloc_task_context(struct task_str=
uct *task,
 	return 0;
 }
=20
-static int io_register_submitter(struct io_ring_ctx *ctx)
-{
-	int ret =3D 0;
-
-	mutex_lock(&ctx->uring_lock);
-	if (!ctx->submitter_task)
-		ctx->submitter_task =3D get_task_struct(current);
-	else if (ctx->submitter_task !=3D current)
-		ret =3D -EEXIST;
-	mutex_unlock(&ctx->uring_lock);
-
-	return ret;
-}
-
 int __io_uring_add_tctx_node(struct io_ring_ctx *ctx)
 {
 	struct io_uring_task *tctx =3D current->io_uring;
@@ -151,11 +137,9 @@ int __io_uring_add_tctx_node_from_submit(struct io_r=
ing_ctx *ctx)
 {
 	int ret;
=20
-	if (ctx->flags & IORING_SETUP_SINGLE_ISSUER) {
-		ret =3D io_register_submitter(ctx);
-		if (ret)
-			return ret;
-	}
+	if (ctx->flags & IORING_SETUP_SINGLE_ISSUER
+	    && ctx->submitter_task !=3D current)
+		return -EEXIST;
=20
 	ret =3D __io_uring_add_tctx_node(ctx);
 	if (ret)
--=20
2.30.2