[PATCH] block: remove an incorrect check from blk_rq_append_bio

[PATCH] block: remove an incorrect check from blk_rq_append_bio

[Christoph Hellwig]

blk_rq_append_bio is also used for the copy case, not just the map case,
so tis debug check is not correct.

Fixes: 393bb12e0058 ("block: stop calling blk_queue_bounce for passthrough requests")
Reported-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Tested-by: Guenter Roeck <linux@roeck-us.net>
---
 block/blk-map.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/block/blk-map.c b/block/blk-map.c
index dac78376acc899..3743158ddaeb76 100644
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -485,9 +485,6 @@ int blk_rq_append_bio(struct request *rq, struct bio *bio)
 	struct bio_vec bv;
 	unsigned int nr_segs = 0;
 
-	if (WARN_ON_ONCE(rq->q->limits.bounce != BLK_BOUNCE_NONE))
-		return -EINVAL;
-
 	bio_for_each_bvec(bv, bio, iter)
 		nr_segs++;
 
-- 
2.30.1

Re: [PATCH] block: remove an incorrect check from blk_rq_append_bio

[Himanshu Madhani]

> On Apr 9, 2021, at 10:04 AM, Christoph Hellwig <hch@lst.de> wrote:
> 
> blk_rq_append_bio is also used for the copy case, not just the map case,
> so tis debug check is not correct.
> 

Small nit.. “this” spelled incorrectly above

> Fixes: 393bb12e0058 ("block: stop calling blk_queue_bounce for passthrough requests")
> Reported-by: Guenter Roeck <linux@roeck-us.net>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> Tested-by: Guenter Roeck <linux@roeck-us.net>
> ---
> block/blk-map.c | 3 ---
> 1 file changed, 3 deletions(-)
> 
> diff --git a/block/blk-map.c b/block/blk-map.c
> index dac78376acc899..3743158ddaeb76 100644
> --- a/block/blk-map.c
> +++ b/block/blk-map.c
> @@ -485,9 +485,6 @@ int blk_rq_append_bio(struct request *rq, struct bio *bio)
> 	struct bio_vec bv;
> 	unsigned int nr_segs = 0;
> 
> -	if (WARN_ON_ONCE(rq->q->limits.bounce != BLK_BOUNCE_NONE))
> -		return -EINVAL;
> -
> 	bio_for_each_bvec(bv, bio, iter)
> 		nr_segs++;
> 
> -- 
> 2.30.1
> 

Looks good otherwise. 

Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>

--
Himanshu Madhani	 Oracle Linux Engineering

Re: [PATCH] block: remove an incorrect check from blk_rq_append_bio

[Chaitanya Kulkarni]

On 4/9/21 08:08, Christoph Hellwig wrote:
> blk_rq_append_bio is also used for the copy case, not just the map case,
> so tis debug check is not correct.
>
> Fixes: 393bb12e0058 ("block: stop calling blk_queue_bounce for passthrough requests")
> Reported-by: Guenter Roeck <linux@roeck-us.net>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> Tested-by: Guenter Roeck <linux@roeck-us.net>

With 's/tis/this/' can be done at the time of applying patch.

The commit 393bb12e0058 does add check in question here.

Looks good.

Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>

Re: [PATCH] block: remove an incorrect check from blk_rq_append_bio

[Jens Axboe]

On 4/9/21 9:04 AM, Christoph Hellwig wrote:
> blk_rq_append_bio is also used for the copy case, not just the map case,
> so tis debug check is not correct.

Applied, thanks.

-- 
Jens Axboe