From 3c3cb6bdf176bcc8360b78832e201bbd47d611e5 Mon Sep 17 00:00:00 2001 From: Gal Hammer Date: Sun, 30 Jan 2022 12:52:10 +0200 Subject: [PATCH] configure/bio_dev: adapt to kernel 5.12 Signed-off-by: Gal Hammer Signed-off-by: Shai Fultheim --- configure.d/1_bio_dev.conf | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/configure.d/1_bio_dev.conf b/configure.d/1_bio_dev.conf index d8c1775..4d69a20 100644 --- a/configure.d/1_bio_dev.conf +++ b/configure.d/1_bio_dev.conf @@ -9,12 +9,15 @@ check() { cur_name=$(basename $2) config_file_path=$1 - if compile_module $cur_name "struct bio b;bio_dev(&b);" "linux/bio.h" "linux/genhd.h" + if compile_module $cur_name "struct bio b = {}; bio_dev(&b); b.bi_bdev = NULL" "linux/bio.h" "linux/genhd.h" then - echo $cur_name "1" >> $config_file_path - elif compile_module $cur_name "struct bio b;b.bi_bdev" "linux/bio.h" + echo $cur_name "1" >> $config_file_path + elif compile_module $cur_name "struct bio b = {}; bio_dev(&b); b.bi_disk = NULL" "linux/bio.h" then echo $cur_name "2" >> $config_file_path + elif compile_module $cur_name "struct bio b; b.bi_bdev = NULL" "linux/bio.h" + then + echo $cur_name "3" >> $config_file_path else echo $cur_name "X" >> $config_file_path fi @@ -26,8 +29,13 @@ apply() { add_define "CAS_BIO_SET_DEV(bio, bdev) \\ bio_set_dev(bio, bdev)" add_define "CAS_BIO_GET_DEV(bio) \\ - bio->bi_disk" ;; + bio->bi_bdev->bd_disk" ;; "2") + add_define "CAS_BIO_SET_DEV(bio, bdev) \\ + bio_set_dev(bio, bdev)" + add_define "CAS_BIO_GET_DEV(bio) \\ + bio->bi_disk" ;; + "3") add_define "CAS_BIO_SET_DEV(bio, bdev) \\ bio->bi_bdev = bdev" add_define "CAS_BIO_GET_DEV(bio) \\