public inbox for [email protected]
 help / color / mirror / Atom feed
From: Pavel Begunkov <[email protected]>
To: Jens Axboe <[email protected]>, [email protected]
Subject: [PATCH 1/4] io_uring: remove opcode check on ltimeout kill
Date: Thu, 22 Oct 2020 16:43:08 +0100	[thread overview]
Message-ID: <5cab0ef8f72674ccabc685ce640b209b4c3e0c39.1603381140.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>

__io_kill_linked_timeout() already checks for REQ_F_LTIMEOUT_ACTIVE and
it's set only for linked timeouts. No need to verify next request's
opcode.

Signed-off-by: Pavel Begunkov <[email protected]>
---
 fs/io_uring.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 29170bbdd708..8d9a017b564a 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -1872,8 +1872,7 @@ static bool __io_kill_linked_timeout(struct io_kiocb *req)
 	if (list_empty(&req->link_list))
 		return false;
 	link = list_first_entry(&req->link_list, struct io_kiocb, link_list);
-	if (link->opcode != IORING_OP_LINK_TIMEOUT)
-		return false;
+
 	/*
 	 * Can happen if a linked timeout fired and link had been like
 	 * req -> link t-out -> link t-out [-> ...]
-- 
2.24.0


  reply	other threads:[~2020-10-22 15:46 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-22 15:43 [PATCH 0/4] clean up linked timeouts Pavel Begunkov
2020-10-22 15:43 ` Pavel Begunkov [this message]
2020-10-22 15:43 ` [PATCH 2/4] io_uring: dont adjust LINK_HEAD in cancel ltimeout Pavel Begunkov
2020-10-22 15:43 ` [PATCH 3/4] io_uring: always clear LINK_TIMEOUT after cancel Pavel Begunkov
2020-10-22 15:43 ` [PATCH 4/4] io_uring: don't defer put of cancelled ltimeout Pavel Begunkov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5cab0ef8f72674ccabc685ce640b209b4c3e0c39.1603381140.git.asml.silence@gmail.com \
    [email protected] \
    [email protected] \
    [email protected] \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox