UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

workqueue: Replace deprecated ida_simple_*() with ida_alloc()/ida_free() 

Replace ida_simple_get() with ida_alloc() and ida_simple_remove() with
ida_free(), the latter is more concise and intuitive.

In addition, if ida_alloc() fails, NULL is returned directly. This
eliminates unnecessary initialization of two local variables and an 'if'
judgment.

Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
Zhen Lei 2021-08-04 11:50:36 +08:00 committed by Tejun Heo
parent 67dc832537
commit e441b56fe4
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kernel/workqueue.c
View File

@ -1912,14 +1912,14 @@ static void worker_detach_from_pool(struct worker *worker)
*/ */
static struct worker *create_worker(struct worker_pool *pool) static struct worker *create_worker(struct worker_pool *pool)
{ {
struct worker *worker = NULL; struct worker *worker;
int id = -1; int id;
char id_buf[16]; char id_buf[16];
/* ID is needed to determine kthread name */ /* ID is needed to determine kthread name */
id = ida_simple_get(&pool->worker_ida, 0, 0, GFP_KERNEL); id = ida_alloc(&pool->worker_ida, GFP_KERNEL);
if (id < 0) if (id < 0)
goto fail; return NULL;
worker = alloc_worker(pool->node); worker = alloc_worker(pool->node);
if (!worker) if (!worker)
@ -1954,8 +1954,7 @@ static struct worker *create_worker(struct worker_pool *pool)
return worker; return worker;
fail: fail:
if (id >= 0) ida_free(&pool->worker_ida, id);
ida_simple_remove(&pool->worker_ida, id);
kfree(worker); kfree(worker);
return NULL; return NULL;
} }
@ -2378,7 +2377,7 @@ woke_up:
set_pf_worker(false); set_pf_worker(false);
set_task_comm(worker->task, "kworker/dying"); set_task_comm(worker->task, "kworker/dying");
ida_simple_remove(&pool->worker_ida, worker->id); ida_free(&pool->worker_ida, worker->id);
worker_detach_from_pool(worker); worker_detach_from_pool(worker);
kfree(worker); kfree(worker);
return 0; return 0;