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

Merge pull request #1635 from robertbaldyga/kernel-6.14

Browse Source 
Support kernel 6.14
This commit is contained in:
Robert Baldyga 2025-03-27 20:15:37 +01:00 committed by GitHub
commit 8c6bf2c117
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure.d/1_mq_flags.conf
View File

@ -1,6 +1,7 @@
#!/bin/bash #!/bin/bash
# #
# Copyright(c) 2012-2022 Intel Corporation # Copyright(c) 2012-2022 Intel Corporation
# Copyright(c) 2025 Huawei Technologies
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
@ -22,6 +23,11 @@ check() {
output=$((output+2)) output=$((output+2))
fi fi
if compile_module $cur_name "BLK_MQ_F_SHOULD_MERGE ;" "linux/blk-mq.h"
then
output=$((output+4))
fi
echo $cur_name $output >> $config_file_path echo $cur_name $output >> $config_file_path
} }
@ -42,6 +48,14 @@ apply() {
else else
add_define "CAS_BLK_MQ_F_BLOCKING 0" add_define "CAS_BLK_MQ_F_BLOCKING 0"
fi fi
if ((arg & 4))
then
add_define "CAS_BLK_MQ_F_SHOULD_MERGE \\
BLK_MQ_F_SHOULD_MERGE"
else
add_define "CAS_BLK_MQ_F_SHOULD_MERGE 0"
fi
} }
conf_run $@ conf_run $@

3
modules/cas_cache/exp_obj.c
View File

@ -351,7 +351,8 @@ static int _cas_init_tag_set(struct cas_disk *dsk, struct blk_mq_tag_set *set)
set->queue_depth = CAS_BLKDEV_DEFAULT_RQ; set->queue_depth = CAS_BLKDEV_DEFAULT_RQ;
set->cmd_size = 0; set->cmd_size = 0;
set->flags = BLK_MQ_F_SHOULD_MERGE | CAS_BLK_MQ_F_STACKING | CAS_BLK_MQ_F_BLOCKING; set->flags = CAS_BLK_MQ_F_SHOULD_MERGE | CAS_BLK_MQ_F_STACKING |
CAS_BLK_MQ_F_BLOCKING;
set->driver_data = dsk; set->driver_data = dsk;