2023-07-25 05:38:19

by Jinyoung Choi

Subject: [PATCH] block: cleanup bio_integrity_prep

If a problem occurs in the process of creating an integrity payload, the
status of bio is always BLK_STS_RESOURCE.

Reviewed-by: Christoph Hellwig <[email protected]>
Signed-off-by: Jinyoung Choi <[email protected]>
---
block/bio-integrity.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index 8f0af7ac8573..045553a164e0 100644
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -199,7 +199,6 @@ bool bio_integrity_prep(struct bio *bio)
unsigned long start, end;
unsigned int len, nr_pages;
unsigned int bytes, offset, i;
- blk_status_t status;

if (!bi)
return true;
@@ -227,7 +226,6 @@ bool bio_integrity_prep(struct bio *bio)
/* Allocate kernel buffer for protection data */
len = bio_integrity_bytes(bi, bio_sectors(bio));
buf = kmalloc(len, GFP_NOIO);
- status = BLK_STS_RESOURCE;
if (unlikely(buf == NULL)) {
printk(KERN_ERR "could not allocate integrity buffer\n");
goto err_end_io;
@@ -242,7 +240,6 @@ bool bio_integrity_prep(struct bio *bio)
if (IS_ERR(bip)) {
printk(KERN_ERR "could not allocate data integrity bioset\n");
kfree(buf);
- status = BLK_STS_RESOURCE;
goto err_end_io;
}

@@ -270,7 +267,6 @@ bool bio_integrity_prep(struct bio *bio)

if (ret == 0) {
printk(KERN_ERR "could not attach integrity payload\n");
- status = BLK_STS_RESOURCE;
goto err_end_io;
}

@@ -292,7 +288,7 @@ bool bio_integrity_prep(struct bio *bio)
return true;

err_end_io:
- bio->bi_status = status;
+ bio->bi_status = BLK_STS_RESOURCE;
bio_endio(bio);
return false;

--
2.34.1

2023-07-26 01:22:06

by Martin K. Petersen

Subject: Re: [PATCH] block: cleanup bio_integrity_prep

Jinyoung,

> If a problem occurs in the process of creating an integrity payload,
> the status of bio is always BLK_STS_RESOURCE.

Looks fine.

Reviewed-by: Martin K. Petersen <[email protected]>

--
Martin K. Petersen Oracle Linux Engineering

2023-07-26 03:44:48

by Jens Axboe

Subject: Re: [PATCH] block: cleanup bio_integrity_prep

On Tue, 25 Jul 2023 14:18:39 +0900, Jinyoung Choi wrote:
> If a problem occurs in the process of creating an integrity payload, the
> status of bio is always BLK_STS_RESOURCE.
>
>

Applied, thanks!

[1/1] block: cleanup bio_integrity_prep
commit: 51d74ec9b62f5813767a60226acaf943e26e7d7a

Best regards,
--
Jens Axboe