diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2021-01-26 14:17:01 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-01-30 15:55:18 +0300 |
| commit | 18f31594ee52ed1f364e376767fb839935fd899c (patch) | |
| tree | 90fd973572e8edeaedd251f955fba073f48e58a0 /fs/io_uring.c | |
| parent | 7bf3fb6243a3b153ab1854b331ec19d67a4878bb (diff) | |
| download | linux-18f31594ee52ed1f364e376767fb839935fd899c.tar.xz | |
io_uring: inline io_uring_attempt_task_drop()
[ Upstream commit 4f793dc40bc605b97624fd36baf085b3c35e8bfd ]
A simple preparation change inlining io_uring_attempt_task_drop() into
io_uring_flush().
Cc: stable@vger.kernel.org # 5.5+
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/io_uring.c')
| -rw-r--r-- | fs/io_uring.c | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 8cb0db187d90..c4e0c352115f 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -8835,23 +8835,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; @@ -8943,7 +8926,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; } |