[ Upstream commit 4f793dc40bc605b97624fd36baf085b3c35e8bfd ]
A simple preparation change inlining io_uring_attempt_task_drop() into
io_uring_flush().
Cc: stable@xxxxxxxxxxxxxxx # 5.5+
Signed-off-by: Pavel Begunkov <asml.silence@xxxxxxxxx>
Signed-off-by: Jens Axboe <axboe@xxxxxxxxx>
---
fs/io_uring.c | 29 +++++++++++------------------
1 file changed, 11 insertions(+), 18 deletions(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 265aea2cd7bc..6c89d38076d0 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -8804,23 +8804,6 @@ static void io_uring_del_task_file(struct file *file)
fput(file);
}
-/*
- * Drop task note for this file if we're the only ones that hold it after
- * pending fput()
- */
-static void io_uring_attempt_task_drop(struct file *file)
-{
- if (!current->io_uring)
- return;
- /*
- * fput() is pending, will be 2 if the only other ref is our potential
- * task file note. If the task is exiting, drop regardless of count.
- */
- if (fatal_signal_pending(current) || (current->flags & PF_EXITING) ||
- atomic_long_read(&file->f_count) == 2)
- io_uring_del_task_file(file);
-}
-
static void io_uring_remove_task_files(struct io_uring_task *tctx)
{
struct file *file;
@@ -8912,7 +8895,17 @@ void __io_uring_task_cancel(void)
static int io_uring_flush(struct file *file, void *data)
{
- io_uring_attempt_task_drop(file);
+ if (!current->io_uring)
+ return 0;
+
+ /*
+ * fput() is pending, will be 2 if the only other ref is our potential
+ * task file note. If the task is exiting, drop regardless of count.
+ */
+ if (fatal_signal_pending(current) || (current->flags & PF_EXITING) ||
+ atomic_long_read(&file->f_count) == 2)
+ io_uring_del_task_file(file);
+
return 0;
}
--
2.24.0
