@@ -1029,7 +1029,7 @@ static const struct io_op_def io_op_defs[] = {
1029
1029
};
1030
1030
1031
1031
static bool io_disarm_next (struct io_kiocb * req );
1032
- static void io_uring_del_task_file (unsigned long index );
1032
+ static void io_uring_del_tctx_node (unsigned long index );
1033
1033
static void io_uring_try_cancel_requests (struct io_ring_ctx * ctx ,
1034
1034
struct task_struct * task ,
1035
1035
bool cancel_all );
@@ -8714,7 +8714,7 @@ static void io_tctx_exit_cb(struct callback_head *cb)
8714
8714
* node. It'll be removed by the end of cancellation, just ignore it.
8715
8715
*/
8716
8716
if (!atomic_read (& tctx -> in_idle ))
8717
- io_uring_del_task_file ((unsigned long )work -> ctx );
8717
+ io_uring_del_tctx_node ((unsigned long )work -> ctx );
8718
8718
complete (& work -> completion );
8719
8719
}
8720
8720
@@ -8967,7 +8967,7 @@ static void io_uring_try_cancel_requests(struct io_ring_ctx *ctx,
8967
8967
}
8968
8968
}
8969
8969
8970
- static int __io_uring_add_task_file (struct io_ring_ctx * ctx )
8970
+ static int __io_uring_add_tctx_node (struct io_ring_ctx * ctx )
8971
8971
{
8972
8972
struct io_uring_task * tctx = current -> io_uring ;
8973
8973
struct io_tctx_node * node ;
@@ -9004,19 +9004,19 @@ static int __io_uring_add_task_file(struct io_ring_ctx *ctx)
9004
9004
/*
9005
9005
* Note that this task has used io_uring. We use it for cancelation purposes.
9006
9006
*/
9007
- static inline int io_uring_add_task_file (struct io_ring_ctx * ctx )
9007
+ static inline int io_uring_add_tctx_node (struct io_ring_ctx * ctx )
9008
9008
{
9009
9009
struct io_uring_task * tctx = current -> io_uring ;
9010
9010
9011
9011
if (likely (tctx && tctx -> last == ctx ))
9012
9012
return 0 ;
9013
- return __io_uring_add_task_file (ctx );
9013
+ return __io_uring_add_tctx_node (ctx );
9014
9014
}
9015
9015
9016
9016
/*
9017
9017
* Remove this io_uring_file -> task mapping.
9018
9018
*/
9019
- static void io_uring_del_task_file (unsigned long index )
9019
+ static void io_uring_del_tctx_node (unsigned long index )
9020
9020
{
9021
9021
struct io_uring_task * tctx = current -> io_uring ;
9022
9022
struct io_tctx_node * node ;
@@ -9046,7 +9046,7 @@ static void io_uring_clean_tctx(struct io_uring_task *tctx)
9046
9046
unsigned long index ;
9047
9047
9048
9048
xa_for_each (& tctx -> xa , index , node )
9049
- io_uring_del_task_file (index );
9049
+ io_uring_del_tctx_node (index );
9050
9050
if (wq ) {
9051
9051
/*
9052
9052
* Must be after io_uring_del_task_file() (removes nodes under
@@ -9330,7 +9330,7 @@ SYSCALL_DEFINE6(io_uring_enter, unsigned int, fd, u32, to_submit,
9330
9330
}
9331
9331
submitted = to_submit ;
9332
9332
} else if (to_submit ) {
9333
- ret = io_uring_add_task_file (ctx );
9333
+ ret = io_uring_add_tctx_node (ctx );
9334
9334
if (unlikely (ret ))
9335
9335
goto out ;
9336
9336
mutex_lock (& ctx -> uring_lock );
@@ -9540,7 +9540,7 @@ static int io_uring_install_fd(struct io_ring_ctx *ctx, struct file *file)
9540
9540
if (fd < 0 )
9541
9541
return fd ;
9542
9542
9543
- ret = io_uring_add_task_file (ctx );
9543
+ ret = io_uring_add_tctx_node (ctx );
9544
9544
if (ret ) {
9545
9545
put_unused_fd (fd );
9546
9546
return ret ;
0 commit comments