hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block: cleanup bio_integrity_prep

Browse Source 
[ Upstream commit 51d74ec9b62f5813767a60226acaf943e26e7d7a ]

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 <hch@lst.de>
Signed-off-by: Jinyoung Choi <j-young.choi@samsung.com>
Reviewed-by: "Martin K. Petersen" <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20230725051839epcms2p8e4d20ad6c51326ad032e8406f59d0aaa@epcms2p8
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Stable-dep-of: 899ee2c3829c ("block: initialize integrity buffer to zero before writing it to media")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jinyoung Choi 2023-07-25 14:18:39 +09:00 committed by Greg Kroah-Hartman
parent 5e0cde523f
commit a9a99a1ca1
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
block/bio-integrity.c
View File

@ -199,7 +199,6 @@ bool bio_integrity_prep(struct bio *bio)
unsigned long start, end; unsigned long start, end;
unsigned int len, nr_pages; unsigned int len, nr_pages;
unsigned int bytes, offset, i; unsigned int bytes, offset, i;
blk_status_t status;
if (!bi) if (!bi)
return true; return true;
@ -227,7 +226,6 @@ bool bio_integrity_prep(struct bio *bio)
/* Allocate kernel buffer for protection data */ /* Allocate kernel buffer for protection data */
len = bio_integrity_bytes(bi, bio_sectors(bio)); len = bio_integrity_bytes(bi, bio_sectors(bio));
buf = kmalloc(len, GFP_NOIO); buf = kmalloc(len, GFP_NOIO);
status = BLK_STS_RESOURCE;
if (unlikely(buf == NULL)) { if (unlikely(buf == NULL)) {
printk(KERN_ERR "could not allocate integrity buffer\n"); printk(KERN_ERR "could not allocate integrity buffer\n");
goto err_end_io; goto err_end_io;
@ -242,7 +240,6 @@ bool bio_integrity_prep(struct bio *bio)
if (IS_ERR(bip)) { if (IS_ERR(bip)) {
printk(KERN_ERR "could not allocate data integrity bioset\n"); printk(KERN_ERR "could not allocate data integrity bioset\n");
kfree(buf); kfree(buf);
status = BLK_STS_RESOURCE;
goto err_end_io; goto err_end_io;
} }
@ -270,7 +267,6 @@ bool bio_integrity_prep(struct bio *bio)
if (ret == 0) { if (ret == 0) {
printk(KERN_ERR "could not attach integrity payload\n"); printk(KERN_ERR "could not attach integrity payload\n");
status = BLK_STS_RESOURCE;
goto err_end_io; goto err_end_io;
} }
@ -292,7 +288,7 @@ bool bio_integrity_prep(struct bio *bio)
return true; return true;
err_end_io: err_end_io:
bio->bi_status = status; bio->bi_status = BLK_STS_RESOURCE;
bio_endio(bio); bio_endio(bio);
return false; return false;