github/open-cas-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure/bd_first_part: adapt to kernel 5.12

Browse Source 
The disk's partitions table was changed to xarray.

Signed-off-by: Gal Hammer <gal.hammer@huawei.com>
Signed-off-by: Shai Fultheim <shai.fultheim@huawei.com>
This commit is contained in:
Gal Hammer 2022-02-07 14:53:34 +02:00 committed by Robert Baldyga
parent 3c3cb6bdf1
commit 1d64bc5294
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
configure.d/1_bd_first_part.conf
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# #
# Copyright(c) 2012-2021 Intel Corporation # Copyright(c) 2012-2022 Intel Corporation
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
@ -9,12 +9,15 @@
check() { check() {
cur_name=$(basename $2) cur_name=$(basename $2)
config_file_path=$1 config_file_path=$1
if compile_module $cur_name "struct block_device bd; bd = *disk_part_iter_next(NULL);" "linux/blk_types.h" "linux/genhd.h" if compile_module $cur_name "struct gendisk *disk = NULL; struct xarray xa; xa = disk->part_tbl" "linux/genhd.h"
then then
echo $cur_name "1" >> $config_file_path echo $cur_name "1" >> $config_file_path
elif compile_module $cur_name "struct hd_struct hd; hd = *disk_part_iter_next(NULL);" "linux/genhd.h" elif compile_module $cur_name "struct block_device bd; bd = *disk_part_iter_next(NULL);" "linux/blk_types.h"
then then
echo $cur_name "2" >> $config_file_path echo $cur_name "2" >> $config_file_path
elif compile_module $cur_name "struct hd_struct hd; hd = *disk_part_iter_next(NULL);" "linux/genhd.h"
then
echo $cur_name "3" >> $config_file_path
else else
echo $cur_name "X" >> $config_file_path echo $cur_name "X" >> $config_file_path
fi fi
@ -25,6 +28,23 @@ apply() {
"1") "1")
add_function " add_function "
static inline int cas_bd_get_next_part(struct block_device *bd) static inline int cas_bd_get_next_part(struct block_device *bd)
{
int part_no = 0;
struct gendisk *disk = bd->bd_disk;
struct block_device *part;
unsigned long idx;
xa_for_each(&disk->part_tbl, idx, part) {
if ((part_no = part->bd_partno)) {
break;
}
}
return part_no;
}" ;;
"2")
add_function "
static inline int cas_bd_get_next_part(struct block_device *bd)
{ {
int part_no = 0; int part_no = 0;
struct gendisk *disk = bd->bd_disk; struct gendisk *disk = bd->bd_disk;
@ -44,7 +64,7 @@ apply() {
return part_no; return part_no;
}" ;; }" ;;
"2") "3")
add_function " add_function "
static inline int cas_bd_get_next_part(struct block_device *bd) static inline int cas_bd_get_next_part(struct block_device *bd)
{ {