Re: [PATCH 2/4] io-wq: code clean of io_wqe_create_worker()

[Hao Xu <haoxu@linux.alibaba.com>]

在 2021/9/12 上午3:40, Hao Xu 写道:
> Remove do_create to save a local variable.
> 
> Signed-off-by: Hao Xu <haoxu@linux.alibaba.com>
> ---
>   fs/io-wq.c | 19 +++++++------------
>   1 file changed, 7 insertions(+), 12 deletions(-)
> 
> diff --git a/fs/io-wq.c b/fs/io-wq.c
> index 1b102494e970..0e1288a549eb 100644
> --- a/fs/io-wq.c
> +++ b/fs/io-wq.c
> @@ -246,8 +246,6 @@ static bool io_wqe_activate_free_worker(struct io_wqe *wqe,
>    */
>   static bool io_wqe_create_worker(struct io_wqe *wqe, struct io_wqe_acct *acct)
>   {
> -	bool do_create = false;
> -
>   	/*
>   	 * Most likely an attempt to queue unbounded work on an io_wq that
>   	 * wasn't setup with any unbounded workers.
> @@ -256,18 +254,15 @@ static bool io_wqe_create_worker(struct io_wqe *wqe, struct io_wqe_acct *acct)
>   		pr_warn_once("io-wq is not configured for unbound workers");
>   
>   	raw_spin_lock(&wqe->lock);
> -	if (acct->nr_workers < acct->max_workers) {
> -		acct->nr_workers++;
> -		do_create = true;
> +	if (acct->nr_workers == acct->max_workers) {
> +		raw_spin_unlock(&wqe->lock);
> +		return false;
Hi Jens, would you like to tweak it to return true or would like me to
send a fix.
>   	}
> +	acct->nr_workers++;
>   	raw_spin_unlock(&wqe->lock);
> -	if (do_create) {
> -		atomic_inc(&acct->nr_running);
> -		atomic_inc(&wqe->wq->worker_refs);
> -		return create_io_worker(wqe->wq, wqe, acct->index);
> -	}
> -
> -	return false;
> +	atomic_inc(&acct->nr_running);
> +	atomic_inc(&wqe->wq->worker_refs);
> +	return create_io_worker(wqe->wq, wqe, acct->index);
>   }
>   
>   static void io_wqe_inc_running(struct io_worker *worker)
>