[v2] A few bugfix and cleancode patch for bfq

[PATCH RESEND v2 04/10] block, bfq: use helper macro RQ_BFQQ to get bfqq of request

Posted by Kemeng Shi 2 years, 8 months ago

Use helper macro RQ_BFQQ to get bfqq of request.

Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>
---
 block/bfq-iosched.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index 9441fc98961a..c3c4c83ee95f 100644
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -6683,14 +6683,14 @@ static struct bfq_queue *bfq_init_rq(struct request *rq)
 		return NULL;
 
 	/*
-	 * Assuming that elv.priv[1] is set only if everything is set
+	 * Assuming that RQ_BFQQ(rq) is set only if everything is set
 	 * for this rq. This holds true, because this function is
 	 * invoked only for insertion or merging, and, after such
 	 * events, a request cannot be manipulated any longer before
 	 * being removed from bfq.
 	 */
-	if (rq->elv.priv[1])
-		return rq->elv.priv[1];
+	if (RQ_BFQQ(rq))
+		return RQ_BFQQ(rq);
 
 	bic = icq_to_bic(rq->elv.icq);
 
-- 
2.30.0

Re: [PATCH RESEND v2 04/10] block, bfq: use helper macro RQ_BFQQ to get bfqq of request

Posted by Jan Kara 2 years, 8 months ago

On Fri 23-12-22 03:16:35, Kemeng Shi wrote:
> Use helper macro RQ_BFQQ to get bfqq of request.
> 
> Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>

Yeah, why not. Feel free to add:

Reviewed-by: Jan Kara <jack@suse.cz>

								Honza

> ---
>  block/bfq-iosched.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
> index 9441fc98961a..c3c4c83ee95f 100644
> --- a/block/bfq-iosched.c
> +++ b/block/bfq-iosched.c
> @@ -6683,14 +6683,14 @@ static struct bfq_queue *bfq_init_rq(struct request *rq)
>  		return NULL;
>  
>  	/*
> -	 * Assuming that elv.priv[1] is set only if everything is set
> +	 * Assuming that RQ_BFQQ(rq) is set only if everything is set
>  	 * for this rq. This holds true, because this function is
>  	 * invoked only for insertion or merging, and, after such
>  	 * events, a request cannot be manipulated any longer before
>  	 * being removed from bfq.
>  	 */
> -	if (rq->elv.priv[1])
> -		return rq->elv.priv[1];
> +	if (RQ_BFQQ(rq))
> +		return RQ_BFQQ(rq);
>  
>  	bic = icq_to_bic(rq->elv.icq);
>  
> -- 
> 2.30.0
> 
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR