redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
zero-sugar-mainline-defconfig
Pavel Begunkov 2021-01-08 20:57:23 +00:00 committed by Jens Axboe
parent 55e6ac1e1f
commit 4f793dc40b
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
fs/io_uring.c
View File

@ -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;
}