mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-01 21:06:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

scst_lib: Fix bio_kmalloc usage to match change in Linux kernel v5.19

Browse Source 
In kernel commit 066ff571011d ("block: turn bio_kmalloc into a simple kmalloc
wrapper"), the order of arguments to bio_kmalloc changed, as did its semantics.
This commit is contained in:
Brian Meagher
2023-01-28 14:52:48 +03:00
committed by Gleb Chesnokov
parent d401702aba
commit 87340a8427
1 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scst/src/scst_lib.c
+29
View File
@@ -7968,7 +7968,16 @@ static void blk_bio_map_kern_endio(struct bio *bio)
} }
} }
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0)
/*
* See commit 066ff571011d ("block: turn bio_kmalloc into a simple
* kmalloc wrapper").
*/
bio_uninit(bio);
kfree(bio);
#else
bio_put(bio); bio_put(bio);
#endif
return; return;
} }
@@ -8242,11 +8251,22 @@ static struct request *__blk_map_kern_sg(struct request_queue *q,
int rc; int rc;
if (need_new_bio) { if (need_new_bio) {
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0)
/*
* See commit 066ff571011d ("block: turn
* bio_kmalloc into a simple kmalloc wrapper").
*/
bio = bio_kmalloc(max_nr_vecs, gfp_mask);
#else
bio = bio_kmalloc(gfp_mask, max_nr_vecs); bio = bio_kmalloc(gfp_mask, max_nr_vecs);
#endif
if (bio == NULL) { if (bio == NULL) {
rq = ERR_PTR(-ENOMEM); rq = ERR_PTR(-ENOMEM);
goto out_free_bios; goto out_free_bios;
} }
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0)
bio_init(bio, NULL, bio->bi_inline_vecs, max_nr_vecs, 0);
#endif
if (!reading) if (!reading)
#if (!defined(CONFIG_SUSE_KERNEL) && \ #if (!defined(CONFIG_SUSE_KERNEL) && \
@@ -8325,7 +8345,16 @@ out_free_bios:
while (hbio != NULL) { while (hbio != NULL) {
bio = hbio; bio = hbio;
hbio = hbio->bi_next; hbio = hbio->bi_next;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0)
/*
* See commit 066ff571011d ("block: turn bio_kmalloc into a
* simple kmalloc wrapper").
*/
bio_uninit(bio);
kfree(bio);
#else
bio_put(bio); bio_put(bio);
#endif
} }
goto out; goto out;
} }