aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Begunkov <asml.silence@gmail.com>2021-01-08 20:57:23 +0000
committerJens Axboe <axboe@kernel.dk>2021-01-09 09:21:43 -0700
commit4f793dc40bc605b97624fd36baf085b3c35e8bfd (patch)
tree61c8bd2b523adeb1663893fccaff29c57fbb3380
parent55e6ac1e1f31c7f678d9f3c8d54c6f102e5f1550 (diff)
downloadlinux-stericsson-4f793dc40bc605b97624fd36baf085b3c35e8bfd.tar.gz
io_uring: inline io_uring_attempt_task_drop()
A simple preparation change inlining io_uring_attempt_task_drop() into io_uring_flush(). Signed-off-by: Pavel Begunkov <asml.silence@gmail.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--fs/io_uring.c29
1 files changed, 11 insertions, 18 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 55ba1922a349..1c931e7a3948 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -8964,23 +8964,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;
@@ -9072,7 +9055,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;
}